update (#41)

Author: Jeremy Dai

.github/workflows/auto-update.yml

@@ -93,50 +93,6 @@ jobs:
           git push origin "$BRANCH_NAME" --force  # Push to the new branch
           echo "branch_name=$BRANCH_NAME" >> $GITHUB_ENV
 
-      - name: Create Pull Request
-        if: steps.run_script.outputs.script_success == 'true'
-        uses: actions/github-script@v6
-        id: create_pr
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const { owner, repo } = context.repo;
-            const issue_number = context.issue.number;
-            const issue_body = context.payload.issue.body;
-            const branch_name = process.env.branch_name;
-            
-            // Check if PR already exists
-            const prs = await github.rest.pulls.list({
-              owner,
-              repo,
-              head: `${owner}:${branch_name}`,
-              state: 'open'
-            });
-            
-            let pr_number;
-            let pr_url;
-            
-            if (prs.data.length === 0) {
-              // Create new PR
-              const result = await github.rest.pulls.create({
-                owner,
-                repo,
-                title: `Add server from issue #${issue_number}`,
-                body: `Automated PR from issue #${issue_number}\n\nServer URL: ${issue_body}`,
-                head: branch_name,
-                base: 'main'
-              });
-              
-              pr_number = result.data.number;
-              pr_url = result.data.html_url;
-            } else {
-              // PR exists
-              pr_number = prs.data[0].number;
-              pr_url = prs.data[0].html_url;
-            }
-            
-            return { pr_number, pr_url };
-
       - name: Comment on issue with success
         if: steps.run_script.outputs.script_success == 'true'
         uses: actions/github-script@v6
@@ -145,21 +101,17 @@ jobs:
           script: |
             const issue_number = context.issue.number;
             const repo = context.repo;
-            const pr_result = ${{ steps.create_pr.outputs.result }};
-            const result = JSON.parse(pr_result);
+            const branch_name = process.env.branch_name;
             
-            let body = '';
-            if (result.pr_number) {
-              body = `✅ Processing complete!\n\nA pull request has been created with the server manifest: [PR #${result.pr_number}](${result.pr_url})`;
-            } else {
-              body = `⚠️ Processing completed, but no pull request was created. Please check the action logs for details.`;
-            }
+            // Generate direct PR creation URL
+            const pr_title = encodeURIComponent(`Add server from issue #${issue_number}`);
+            const pr_url = `https://github.com/${repo.owner}/${repo.repo}/compare/main...${branch_name}?quick_pull=1&title=${pr_title}`;
             
             await github.rest.issues.createComment({
               owner: repo.owner,
               repo: repo.repo,
               issue_number: issue_number,
-              body: body
+              body: `✅ Processing complete!\n\nClick here to create the pull request with one click: [Create PR](${pr_url})`
             });
             
       - name: Comment on issue with failure

scripts/get_manifest.py

@@ -26,7 +26,7 @@ def __init__(self):
             api_key=os.environ.get("OPENROUTER_API_KEY"),
         )
 
-    def extract_description_from_readme(self, readme_content: str) -> str:
+    def extract_description_from_readme(self, readme_content: str, repo_url: str = "") -> str:
         """Extract a concise description from README content.
 
         Looks for the first meaningful description paragraph near the beginning
@@ -35,6 +35,7 @@ def extract_description_from_readme(self, readme_content: str) -> str:
 
         Args:
             readme_content: Contents of README.md
+            repo_url: GitHub repository URL to extract name for title matching
 
         Returns:
             Extracted description or empty string if not found
@@ -90,10 +91,10 @@ def extract_description_from_readme(self, readme_content: str) -> str:
 
             # If we couldn't find a good description in regular text,
             # check content under main repo name heading
-            if not description:
+            if not description and repo_url:
                 for heading, content in title_content.items():
                     # Look for the repo name in the heading
-                    if heading and "/" in repo_url:
+                    if heading:
                         repo_name = repo_url.strip('/').split('/')[-1].lower()
                         if repo_name.lower() in heading.lower():
                             for line in content:
@@ -184,13 +185,31 @@ def _convert_to_raw_url(self, repo_url: str) -> str:
         if "github.com" not in repo_url:
             raise ValueError(f"Invalid GitHub URL: {repo_url}")
 
+        # Handle subdirectory URLs (tree format)
         if "/tree/" in repo_url:
-            return repo_url.replace("/tree/", "/raw/")
+            # For URLs like github.com/user/repo/tree/branch/path/to/dir
+            parts = repo_url.split("/tree/")
+            base_url = parts[0].replace(
+                "github.com", "raw.githubusercontent.com")
+            path_parts = parts[1].split("/", 1)
+
+            if len(path_parts) > 1:
+                branch = path_parts[0]
+                subdir = path_parts[1]
+                return f"{base_url}/{branch}/{subdir}/README.md"
+            else:
+                branch = path_parts[0]
+                return f"{base_url}/{branch}/README.md"
 
+        # Handle direct file URLs
         if "/blob/" in repo_url:
             raw_url = repo_url.replace("/blob/", "/raw/")
-            return raw_url if raw_url.endswith(".md") else f"{raw_url}/README.md"
+            if raw_url.endswith(".md"):
+                return raw_url
+            else:
+                return f"{raw_url}/README.md"
 
+        # Handle repository root URLs
         raw_url = repo_url.replace("github.com", "raw.githubusercontent.com")
         return f"{raw_url.rstrip('/')}/main/README.md"
 
@@ -434,7 +453,15 @@ def generate_manifest(self, repo_url: str, server_name: Optional[str] = None) ->
             # Extract repo info
             parts = repo_url.strip("/").split("/")
             owner = parts[3]
-            name = parts[4]
+
+            # Extract name, handling subdirectories in tree format
+            if "/tree/" in repo_url and "/src/" in repo_url:
+                # For subdirectories in the src folder, use the subdirectory name
+                src_path = repo_url.split("/src/")[1]
+                name = src_path.split("/")[0]
+            else:
+                # Default is the last path component
+                name = parts[-1]
 
             # If no server name was explicitly provided, use the one from URL
             if server_name:
@@ -445,7 +472,6 @@ def generate_manifest(self, repo_url: str, server_name: Optional[str] = None) ->
 
             # Get prompt as tuple and extract manifest
             manifest = self.extract_with_llms(repo_url, readme_content)
-
             # Update manifest with repository information
             manifest.update({
                 "name": name,
@@ -455,7 +481,8 @@ def generate_manifest(self, repo_url: str, server_name: Optional[str] = None) ->
             })
 
             # Update manifest with description
-            description = self.extract_description_from_readme(readme_content)
+            description = self.extract_description_from_readme(
+                readme_content, repo_url)
             if not description:
                 description = self.extract_description_from_readme_with_llms(
                     readme_content)
@@ -620,7 +647,6 @@ def main(repo_url: str, is_official: bool = False):
         sys.exit(1)
 
     repo_url = sys.argv[1].strip()
-
     # Check if the URL is a simple URL without protocol
     if not repo_url.startswith(("http://", "https://")):
         # Add https:// if it's a github.com URL without protocol