Upload folder using huggingface_hub

evaluate_atomic_matching.py

@@ -98,55 +98,20 @@ def process_questions(llm_model: str, openai_api_Key: str, deploy_key: str, metr
     with open(filepath, 'w') as f:
         json.dump(results, f, indent=4)
     
-    # Push to git repo and verify
     try:
-        # Validate and clean the deploy key
-        if not deploy_key.startswith('-----BEGIN'):
-            raise Exception("Invalid SSH key format. Key must begin with '-----BEGIN'")
-        
-        # Write deploy key to temporary file with proper line endings
-        key_file = os.path.join(script_dir, "deploy_key")
-        deploy_key_cleaned = deploy_key.strip()
-        
-        # Ensure key has proper line endings and format
-        key_lines = deploy_key_cleaned.split('\n')
-        key_lines = [line.strip() for line in key_lines]  # Remove any extra whitespace
-        deploy_key_cleaned = '\n'.join(key_lines)
-        
-        # Ensure the key ends with a newline
-        if not deploy_key_cleaned.endswith('\n'):
-            deploy_key_cleaned += '\n'
-        
-        # Write the key with proper permissions
-        with open(key_file, 'w', newline='\n') as f:
-            f.write(deploy_key_cleaned)
-        
-        # Ensure correct permissions for SSH key
-        os.chmod(key_file, 0o600)
-        
-        # Print key file contents for debugging (remove in production)
-        with open(key_file, 'r') as f:
-            key_content = f.read()
-            if not key_content.startswith('-----BEGIN'):
-                raise Exception("Key file validation failed - incorrect format")
-        
-        # Set up Git SSH command with more verbose output
-        ssh_command = f'ssh -vvv -i {key_file} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
-        os.environ['GIT_SSH_COMMAND'] = ssh_command
-        
+        # Set up SSH key before git operations
+        try:
+            key_path = setup_ssh_key(deploy_key)
+        except Exception as e:
+            raise Exception(f"Failed to set up SSH key: {str(e)}")
+            
         # Test SSH connection
         try:
-            result = subprocess.run(
-                ['ssh', '-T', '-i', key_file, '-o', 'StrictHostKeyChecking=no', 
-                 '-o', 'UserKnownHostsFile=/dev/null', 'git@github.com'],
-                capture_output=True,
-                text=True,
-                timeout=10
-            )
+            result = subprocess.run(['ssh', '-T', 'git@github.com'], 
+                                  capture_output=True, 
+                                  text=True)
             if result.returncode != 1:  # GitHub's SSH test always returns 1 when successful
                 raise Exception(f"SSH test failed with return code {result.returncode}\nOutput: {result.stderr}")
-        except subprocess.CalledProcessError as e:
-            raise Exception(f"SSH connection test failed: {e.stderr if e.stderr else str(e)}")
         except Exception as e:
             raise Exception(f"SSH connection test failed: {str(e)}")
 
@@ -189,19 +154,19 @@ def process_questions(llm_model: str, openai_api_Key: str, deploy_key: str, metr
         except Exception as e:
             raise Exception(f"Git operation failed: {str(e)}")
         finally:
-            # Ensure cleanup happens even if there's an error
+            # Clean up
             try:
                 shutil.rmtree(temp_dir)
             except:
                 pass
             try:
-                os.remove(key_file)
+                os.remove(key_path)  # Remove the SSH key file
             except:
                 pass
         
     except Exception as e:
         error_message = f"Error pushing to repository: {str(e)}\nResults were saved locally to: {filepath}"
-        return error_message, filepath  # Return filepath even on git error
+        return error_message, filepath
 
 def setup_ssh_key(ssh_key_content):
     try: