askmycode 0.1.0__tar.gz → 0.1.1__tar.gz

{askmycode-0.1.0 → askmycode-0.1.1}/.github/workflows/askmycode.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Checkout PR branch
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: refs/pull/${{ github.event.issue.number }}/head
           fetch-depth: 0
 
       - name: Set up Python
@@ -37,8 +37,9 @@ jobs:
 
       - name: Extract question from comment
         id: question
+        env:
+          COMMENT: ${{ github.event.comment.body }}
         run: |
-          COMMENT="${{ github.event.comment.body }}"
           QUESTION="${COMMENT#/ask }"
           echo "question=$QUESTION" >> "$GITHUB_OUTPUT"
 
@@ -46,8 +47,9 @@ jobs:
         id: answer
         env:
           GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+          QUESTION: ${{ steps.question.outputs.question }}
         run: |
-          ANSWER=$(askmycode ask "${{ steps.question.outputs.question }}" --sources)
+          ANSWER=$(askmycode ask "$QUESTION" --sources)
           # Store multi-line output safely
           {
             echo "answer<<EOF"
@@ -57,10 +59,13 @@ jobs:
 
       - name: Post answer as PR comment
         uses: actions/github-script@v7
+        env:
+          QUESTION: ${{ steps.question.outputs.question }}
+          ANSWER: ${{ steps.answer.outputs.answer }}
         with:
           script: |
-            const question = `${{ steps.question.outputs.question }}`;
-            const answer = `${{ steps.answer.outputs.answer }}`;
+            const question = process.env.QUESTION;
+            const answer = process.env.ANSWER;
             const body = [
               `**Q: ${question}**`,
               "",

{askmycode-0.1.0 → askmycode-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: askmycode
-Version: 0.1.0
+Version: 0.1.1
 Summary: Ask questions about any codebase using AI — your code stays private
 Project-URL: Homepage, https://github.com/NewtYao/askmycode
 Project-URL: Issues, https://github.com/NewtYao/askmycode/issues

askmycode-0.1.1/askmycode/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.1"

{askmycode-0.1.0 → askmycode-0.1.1}/askmycode/cli.py

@@ -6,8 +6,6 @@ from google.genai.errors import ClientError, ServerError
 from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
-from google.genai import types as genai_types
-
 from askmycode import config, indexer, llm, manifest, project_config, retriever, store
 
 app = typer.Typer(
@@ -108,6 +106,9 @@ def ask(
     except ServerError as e:
         console.print(f"\n[red]Gemini server error:[/red] {e}")
         raise typer.Exit(1)
+    except Exception as e:
+        console.print(f"\n[red]Error:[/red] {e}")
+        raise typer.Exit(1)
 
     if sources and metadatas:
         seen: set = set()
@@ -202,7 +203,7 @@ def chat(
 
     console.print("[bold]askmycode chat[/bold] — type your question, [dim]exit[/dim] or Ctrl+C to quit.\n")
 
-    history: list[genai_types.Content] = []
+    history: list[dict] = []
     file_tree = llm.build_file_tree(list(manifest.load(project).keys()))
 
     while True:
@@ -238,11 +239,14 @@ def chat(
         except (ClientError, ServerError) as e:
             console.print(f"\n[red]Error:[/red] {e}\n")
             continue
+        except Exception as e:
+            console.print(f"\n[red]Error:[/red] {e}\n")
+            continue
 
         # Append this turn to history for follow-up context
         user_turn = f"Context:\n{context}\n\nQuestion: {question}"
-        history.append(llm._make_turn("user", user_turn))
-        history.append(llm._make_turn("model", "".join(answer_parts)))
+        history.append({"role": "user", "content": user_turn})
+        history.append({"role": "model", "content": "".join(answer_parts)})
 
 
 @app.command()
@@ -282,10 +286,12 @@ app.add_typer(_config_app, name="config")
 @_config_app.command("set-key")
 def config_set_key(
     api_key: str = typer.Argument(..., help="Your API key"),
+    provider: str = typer.Option("", "--provider", "-p", help="Provider this key is for (default: current provider)"),
 ) -> None:
     """Save your API key to ~/.config/askmycode/config.json."""
-    config.set_api_key(api_key)
-    console.print("[green]API key saved.[/green]")
+    prov = provider or config.get_provider()
+    config.set_api_key(api_key, prov)
+    console.print(f"[green]API key saved for provider '{prov}'.[/green]")
 
 
 @_config_app.command("set-provider")

{askmycode-0.1.0 → askmycode-0.1.1}/askmycode/config.py

@@ -27,12 +27,14 @@ def get_api_key(provider: str = "gemini") -> str | None:
     env_var = _ENV_KEYS.get(provider, f"{provider.upper()}_API_KEY")
     if key := os.environ.get(env_var):
         return key
-    return _load().get("api_key")
+    data = _load()
+    # per-provider store, fallback to legacy "api_key" for backwards compat
+    return data.get("api_keys", {}).get(provider) or data.get("api_key")
 
 
-def set_api_key(key: str) -> None:
+def set_api_key(key: str, provider: str = "gemini") -> None:
     data = _load()
-    data["api_key"] = key
+    data.setdefault("api_keys", {})[provider] = key
     _save(data)
 
 

{askmycode-0.1.0 → askmycode-0.1.1}/askmycode/indexer.py

@@ -56,9 +56,8 @@ def _ast_chunks(content: str, lines: list[str], relative: str) -> list[dict] | N
         return None
 
     top_nodes = [
-        n for n in ast.walk(tree)
+        n for n in tree.body
         if isinstance(n, (ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef))
-        and isinstance(getattr(n, "col_offset", -1), int) and n.col_offset == 0
     ]
     if not top_nodes:
         return None

{askmycode-0.1.0 → askmycode-0.1.1}/askmycode/llm.py

@@ -2,6 +2,9 @@ from typing import Iterator
 from google import genai
 from google.genai import types
 
+_GEMINI_ROLE = {"user": "user", "model": "model", "assistant": "model"}
+_OPENAI_ROLE = {"user": "user", "model": "assistant", "assistant": "assistant"}
+
 _SYSTEM = """\
 You are a helpful assistant that answers questions about a software codebase.
 You are given relevant code snippets retrieved from the codebase and a question.
@@ -41,13 +44,16 @@ def _stream_gemini(
     question: str,
     context: str,
     api_key: str,
-    history: list[types.Content] | None,
+    history: list[dict] | None,
     file_tree: str,
     model: str,
 ) -> Iterator[str]:
     client = genai.Client(api_key=api_key)
     user_turn = _build_user_turn(question, context, file_tree)
-    contents = list(history or []) + [_make_turn("user", user_turn)]
+    contents = [
+        _make_turn(_GEMINI_ROLE.get(h["role"], h["role"]), h["content"])
+        for h in (history or [])
+    ] + [_make_turn("user", user_turn)]
     for chunk in client.models.generate_content_stream(
         model=model,
         contents=contents,
@@ -72,7 +78,7 @@ def _stream_openai(
     user_turn = _build_user_turn(question, context, file_tree)
     messages = [{"role": "system", "content": _SYSTEM}]
     for h in history or []:
-        messages.append({"role": h["role"], "content": h["content"]})
+        messages.append({"role": _OPENAI_ROLE.get(h["role"], h["role"]), "content": h["content"]})
     messages.append({"role": "user", "content": user_turn})
     with client.chat.completions.create(model=model, messages=messages, stream=True) as stream:
         for chunk in stream:
@@ -96,7 +102,7 @@ def _stream_anthropic(
     user_turn = _build_user_turn(question, context, file_tree)
     messages = []
     for h in history or []:
-        messages.append({"role": h["role"], "content": h["content"]})
+        messages.append({"role": _OPENAI_ROLE.get(h["role"], h["role"]), "content": h["content"]})
     messages.append({"role": "user", "content": user_turn})
     with client.messages.stream(
         model=model,
@@ -122,7 +128,7 @@ def _stream_ollama(
     user_turn = _build_user_turn(question, context, file_tree)
     messages = [{"role": "system", "content": _SYSTEM}]
     for h in history or []:
-        messages.append({"role": h["role"], "content": h["content"]})
+        messages.append({"role": _OPENAI_ROLE.get(h["role"], h["role"]), "content": h["content"]})
     messages.append({"role": "user", "content": user_turn})
     resp = requests.post(
         f"{base_url}/api/chat",
@@ -145,7 +151,7 @@ def answer_stream(
     question: str,
     context: str,
     api_key: str,
-    history=None,
+    history: list[dict] | None = None,
     file_tree: str = "",
     provider: str = "gemini",
     model: str = "",

{askmycode-0.1.0 → askmycode-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "askmycode"
-version = "0.1.0"
+version = "0.1.1"
 description = "Ask questions about any codebase using AI — your code stays private"
 readme = "README.md"
 requires-python = ">=3.9"

askmycode-0.1.0/askmycode/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.0"