codespy-ai 0.2.1__tar.gz → 0.2.2__tar.gz

{codespy_ai-0.2.1 → codespy_ai-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codespy-ai
-Version: 0.2.1
+Version: 0.2.2
 Summary: Code review agent powered by DSPy
 License: MIT
 License-File: LICENSE

{codespy_ai-0.2.1 → codespy_ai-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codespy-ai"
-version = "0.2.1"
+version = "0.2.2"
 description = "Code review agent powered by DSPy"
 readme = "README.md"
 license = "MIT"

{codespy_ai-0.2.1 → codespy_ai-0.2.2}/src/codespy/__init__.py

@@ -1,3 +1,3 @@
 """codespy - Code review agent powered by DSPy."""
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"

{codespy_ai-0.2.1 → codespy_ai-0.2.2}/src/codespy/config.py

@@ -330,32 +330,23 @@ class Settings(BaseSettings):
 
     @model_validator(mode="after")
     def sync_llm_settings(self) -> "Settings":
-        """Sync LLM settings between nested and flat fields."""
-        # Sync from nested to flat
-        if self.llm.openai_api_key:
-            self.openai_api_key = self.llm.openai_api_key
-        if self.llm.anthropic_api_key:
-            self.anthropic_api_key = self.llm.anthropic_api_key
-        if self.llm.gemini_api_key:
-            self.gemini_api_key = self.llm.gemini_api_key
-        if self.llm.aws_region:
-            self.aws_region = self.llm.aws_region
-        if self.llm.aws_access_key_id:
-            self.aws_access_key_id = self.llm.aws_access_key_id
-        if self.llm.aws_secret_access_key:
-            self.aws_secret_access_key = self.llm.aws_secret_access_key
-
-        # Sync from flat to nested
-        if self.openai_api_key and not self.llm.openai_api_key:
-            self.llm.openai_api_key = self.openai_api_key
-        if self.anthropic_api_key and not self.llm.anthropic_api_key:
-            self.llm.anthropic_api_key = self.anthropic_api_key
-        if self.gemini_api_key and not self.llm.gemini_api_key:
-            self.llm.gemini_api_key = self.gemini_api_key
-
-        # Sync prompt caching setting
-        self.enable_prompt_caching = self.llm.enable_prompt_caching
+        """Sync LLM settings between nested and flat fields.
 
+        Delegates to LLMConfig.sync_from_flat which enforces:
+        env vars (flat fields from pydantic-settings) > YAML/nested > defaults.
+        """
+        merged = self.llm.sync_from_flat(
+            openai_api_key=self.openai_api_key,
+            anthropic_api_key=self.anthropic_api_key,
+            gemini_api_key=self.gemini_api_key,
+            aws_region=self.aws_region,
+            aws_access_key_id=self.aws_access_key_id,
+            aws_secret_access_key=self.aws_secret_access_key,
+        )
+        # Propagate merged values back to flat fields
+        for field, value in merged.items():
+            if value is not None:
+                setattr(self, field, value)
         return self
 
     @model_validator(mode="after")

{codespy_ai-0.2.1 → codespy_ai-0.2.2}/src/codespy/config_llm.py

@@ -268,4 +268,43 @@ class LLMConfig(BaseModel):
     azure_api_version: str | None = None
 
     # Enable provider-side prompt caching (Anthropic, OpenAI, Bedrock, etc.)
-    enable_prompt_caching: bool = True
+    enable_prompt_caching: bool = True
+
+    def sync_from_flat(
+        self,
+        *,
+        openai_api_key: str | None = None,
+        anthropic_api_key: str | None = None,
+        gemini_api_key: str | None = None,
+        aws_region: str | None = None,
+        aws_access_key_id: str | None = None,
+        aws_secret_access_key: str | None = None,
+    ) -> dict[str, object]:
+        """Sync flat settings into this LLMConfig and return values to propagate back.
+
+        Priority: flat fields (from env vars via pydantic-settings) > nested defaults.
+        Returns dict of field values that should be set on the parent Settings.
+        """
+        # Step 1: Flat → nested (env vars win over nested defaults)
+        if openai_api_key:
+            self.openai_api_key = openai_api_key
+        if anthropic_api_key:
+            self.anthropic_api_key = anthropic_api_key
+        if gemini_api_key:
+            self.gemini_api_key = gemini_api_key
+        if aws_region:
+            self.aws_region = aws_region
+        if aws_access_key_id:
+            self.aws_access_key_id = aws_access_key_id
+        if aws_secret_access_key:
+            self.aws_secret_access_key = aws_secret_access_key
+
+        # Step 2: Return merged values (nested fills gaps where flat is not set)
+        return {
+            "openai_api_key": openai_api_key or self.openai_api_key,
+            "anthropic_api_key": anthropic_api_key or self.anthropic_api_key,
+            "gemini_api_key": gemini_api_key or self.gemini_api_key,
+            "aws_access_key_id": aws_access_key_id or self.aws_access_key_id,
+            "aws_secret_access_key": aws_secret_access_key or self.aws_secret_access_key,
+            "enable_prompt_caching": self.enable_prompt_caching,
+        }