astoncli 0.1.1__tar.gz → 0.2.1__tar.gz

{astoncli-0.1.1 → astoncli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astoncli
-Version: 0.1.1
+Version: 0.2.1
 Summary: Automated Python repository migration CLI tool
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{astoncli-0.1.1 → astoncli-0.2.1}/aston/axios.py

@@ -313,7 +313,7 @@ CURRENT SOURCE CODE TO MIGRATE OR REPAIR:
             time.sleep(delay)
             delay *= 2.0
 
-    patched = response.choices[0].message.content
+    patched = response
     clean = clean_mistral_code(patched)
 
     try:

{astoncli-0.1.1 → astoncli-0.2.1}/aston/config.py

@@ -27,6 +27,15 @@ DEFAULT_CONFIG = {
     },
 }
 
+# Runtime overrides storage (populated by CLI flags before execution)
+_RUNTIME_OVERRIDES = {}
+
+
+def set_runtime_config(overrides: dict):
+    """Set temporary runtime configuration overrides from CLI flags."""
+    global _RUNTIME_OVERRIDES
+    _RUNTIME_OVERRIDES.update(overrides)
+
 
 def get_config_dir() -> Path:
     """Ensure and return the user config directory (~/.config/aston/)."""
@@ -38,9 +47,14 @@ def get_config_dir() -> Path:
 def load_config() -> dict:
     """
     Load configuration from ~/.config/aston/config.yaml,
-    falling back to defaults and applying environment variable overrides.
+    falling back to defaults, applying environment variable overrides,
+    and overlaying runtime CLI overrides.
     """
-    config = DEFAULT_CONFIG.copy()
+    # Create a deep-ish copy of defaults to prevent mutating the global dictionary
+    config = {
+        section: values.copy() if isinstance(values, dict) else values
+        for section, values in DEFAULT_CONFIG.items()
+    }
 
     if CONFIG_FILE.is_file():
         try:
@@ -49,7 +63,7 @@ def load_config() -> dict:
                 if isinstance(user_config, dict):
                     # Deep merge user config into defaults
                     for section, values in user_config.items():
-                        if section in config and isinstance(values, dict):
+                        if section in config and isinstance(values, dict) and isinstance(config[section], dict):
                             config[section].update(values)
                         else:
                             config[section] = values
@@ -60,6 +74,14 @@ def load_config() -> dict:
     if os.getenv("ASTON_MODEL"):
         config["llm"]["model"] = os.getenv("ASTON_MODEL")
 
+    # Apply runtime CLI overrides on top
+    if _RUNTIME_OVERRIDES:
+        for section, values in _RUNTIME_OVERRIDES.items():
+            if section in config and isinstance(values, dict) and isinstance(config[section], dict):
+                config[section].update(values)
+            else:
+                config[section] = values
+
     return config
 
 

{astoncli-0.1.1 → astoncli-0.2.1}/aston/ingestion.py

@@ -328,17 +328,23 @@ Validate each candidate independently. Preserve source metadata and exact
 version boundary values supplied by the caller. Do not invent evidence or URLs.
 """
     try:
-        response = call_llm(prompt=user_prompt, provider=provider_name, model=model_name, temperature=temperature, system_prompt=VALIDATOR_SYSTEM_PROMPT, response_format=ValidatedRuleset)
-        parsed = response.choices[0].message.parsed
-        if parsed is None:
+        response = call_llm(
+            prompt=user_prompt, 
+            provider=provider_name, 
+            model=model_name, 
+            temperature=temperature, 
+            system_prompt=VALIDATOR_SYSTEM_PROMPT, 
+            response_format=ValidatedRuleset
+        )
+        parsed = response
+        if parsed is None or not hasattr(parsed, "rules"):
             warning("Validator returned no parsed result; preserving candidates as needs_review.")
             return preserve_for_review(rules, "the validator returned no parsed result")
-        # Match validator output back to source candidates. If the validator
-        # omitted any input, preserve it for review instead of silently losing it.
+            
         unmatched = list(enumerate(rules))
         matched_results: list[tuple[dict, dict]] = []
         for validated_model in parsed.rules:
-            validated = validated_model.model_dump()
+            validated = validated_model.model_dump() if hasattr(validated_model, "model_dump") else dict(validated_model)
             key = _candidate_key(validated)
             match_index = next(
                 (i for i, (_, source) in enumerate(unmatched) if _candidate_key(source) == key),
@@ -741,16 +747,26 @@ def extract_rules(
             f"Documentation chunk:\n{chunk_text}"
         )
 
-        response = call_llm(prompt=content, provider=provider_name, model=model_name, temperature=temperature, system_prompt=prompt, response_format=MigrationRule)
+        response = call_llm(
+            prompt=content, 
+            provider=provider_name, 
+            model=model_name, 
+            temperature=temperature, 
+            system_prompt=prompt, 
+            response_format=MigrationRuleset
+        )
         
-        parsed = response.choices[0].message.parsed
-        if parsed is None:
-            raise RuntimeError(
-                f"Codestral returned no parsed ruleset for {package}, chunk {chunk_number + 1}"
-            )
+        parsed = response
+        
+        # Gracefully handle empty or unparsed chunks instead of raising an error
+        if parsed is None or not hasattr(parsed, "rules") or not parsed.rules:
+            info(f"Chunk {chunk_number + 1} returned no rules for {package}; skipping chunk.")
+            continue
+            
         normalized = normalize_rule_symbols(
-            [rule.model_dump() for rule in parsed.rules]
+            [rule.model_dump() if hasattr(rule, "model_dump") else dict(rule) for rule in parsed.rules]
         )
+        
         for rule in normalized:
             rule["package"] = package
             source_url = rule.get("source_url")

{astoncli-0.1.1 → astoncli-0.2.1}/aston/llm.py

@@ -10,7 +10,7 @@ class BaseLLMProvider(ABC):
 
 class MistralProvider(BaseLLMProvider):
     def generate(self, prompt: str, model: str, temperature: float = 0.0, system_prompt: str = None, response_format=None) -> str:
-        from mistralai import Mistral
+        from mistralai.client import Mistral
         api_key = os.getenv("MISTRAL_API_KEY")
         if not api_key:
             raise LLMError(
@@ -140,7 +140,12 @@ class GoogleProvider(BaseLLMProvider):
                 contents=prompt,
                 config=types.GenerateContentConfig(**config_kwargs)
             )
-            return response.text.strip()
+            
+            # If response_format is used and parsed object is available, return it directly
+            if response_format and hasattr(response, "parsed") and response.parsed is not None:
+                return response.parsed
+                
+            return response.text.strip() if response.text else ""
         except Exception as exc:
             raise LLMError(
                 message="Google Gemini API generation failed.",

{astoncli-0.1.1 → astoncli-0.2.1}/aston/pipeline.py

@@ -410,7 +410,7 @@ def run_for_repo(
     passed_files: list,
     failed_files: list,
     max_tries: int,
-    dokcer_file_time
+    docker_file_time  
 ):
     with open("repo_index.json", "r", encoding="utf-8") as f:
         repo_index = json.load(f)
@@ -683,7 +683,7 @@ def run_for_repo(
             str(candidate_path),
             temp_req_path,
             repo_root=root_path,
-            timeout=dokcer_file_time
+            timeout=docker_file_time
         )
 
         context_data = {
@@ -734,7 +734,7 @@ def run_for_repo(
             temp_req_path=temp_req_path,
             context_data=context_data,
             root_path=root_path,
-            docker_time=dokcer_file_time,
+            docker_time=docker_file_time,
             initial_result=pr,
             max_retries=max_tries,
             passed_files=passed_files,

{astoncli-0.1.1 → astoncli-0.2.1}/astoncli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astoncli
-Version: 0.1.1
+Version: 0.2.1
 Summary: Automated Python repository migration CLI tool
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{astoncli-0.1.1 → astoncli-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "astoncli"  # Available on PyPI, while your internal app and CLI command remain 'aston'
-version = "0.1.1"
+version = "0.2.1"
 description = "Automated Python repository migration CLI tool"
 readme = "README.md"
 requires-python = ">=3.11"