Merge pull request #92 from Miyamura80/claude/fix-todo-issues-PWUug

Fix exception handling and validator anti-patterns

Author: Miyamura80

TODO.md

@@ -9,11 +9,11 @@
 
 ### High Priority
 
-- [ ] Broad exception handling in `src/utils/logging_config.py:64` - catches all exceptions indiscriminately
-- [ ] Validator anti-pattern in `common/global_config.py:188-198` - validators ignore input parameter `v`
-- [ ] Circular import risk in `common/flags.py:6-7` - `setup_logging()` called at import time
-- [ ] Broad exceptions in `utils/llm/dspy_langfuse.py:280,321,438` - catches generic `Exception`
-- [ ] Unsafe exception re-instantiation in `src/utils/logging_config.py:61-71` - reconstructs exceptions unsafely
+- [x] Broad exception handling in `src/utils/logging_config.py:64` - catches all exceptions indiscriminately
+- [x] Validator anti-pattern in `common/global_config.py:188-198` - validators ignore input parameter `v`
+- [x] Circular import risk in `common/flags.py:6-7` - `setup_logging()` called at import time
+- [x] Broad exceptions in `utils/llm/dspy_langfuse.py:280,321,438` - catches generic `Exception`
+- [x] Unsafe exception re-instantiation in `src/utils/logging_config.py:61-71` - reconstructs exceptions unsafely
 
 ### Medium Priority
 

common/flags.py

@@ -3,9 +3,6 @@
 from openfeature.provider.in_memory_provider import InMemoryProvider
 
 from common.global_config import global_config
-from src.utils.logging_config import setup_logging
-
-setup_logging()
 
 
 def setup_feature_flags():

common/global_config.py

@@ -7,7 +7,7 @@
 import yaml
 from dotenv import dotenv_values, load_dotenv
 from loguru import logger
-from pydantic import Field, field_validator
+from pydantic import Field
 from pydantic_settings import (
     BaseSettings,
     PydanticBaseSettingsSource,
@@ -180,22 +180,15 @@ class Config(BaseSettings):
     PERPLEXITY_API_KEY: str | None = None
     GEMINI_API_KEY: str | None = None
 
-    # Runtime environment (computed)
-    is_local: bool = Field(default=False)
-    running_on: str = Field(default="")
-
-    @field_validator("is_local", mode="before")
-    @classmethod
-    def set_is_local(cls, v: Any) -> bool:
-        """Set is_local based on GITHUB_ACTIONS env var."""
-        return os.getenv("GITHUB_ACTIONS") != "true"
-
-    @field_validator("running_on", mode="before")
-    @classmethod
-    def set_running_on(cls, v: Any) -> str:
-        """Set running_on based on is_local."""
-        is_local = os.getenv("GITHUB_ACTIONS") != "true"
-        return "🖥️  local" if is_local else "☁️  CI"
+    # Runtime environment (computed via default_factory)
+    is_local: bool = Field(
+        default_factory=lambda: os.getenv("GITHUB_ACTIONS") != "true"
+    )
+    running_on: str = Field(
+        default_factory=lambda: "🖥️  local"
+        if os.getenv("GITHUB_ACTIONS") != "true"
+        else "☁️  CI"
+    )
 
     @classmethod
     def settings_customise_sources(

src/utils/logging_config.py

@@ -95,9 +95,10 @@ def scrub_sensitive_data(record):
             try:
                 # Most standard exceptions accept a single string argument
                 new_value = type_(scrubbed_value_str)
-            except Exception:
+            except TypeError:
                 # Fallback to a generic Exception if type instantiation fails
-                new_value = Exception(scrubbed_value_str)
+                # (e.g., some exceptions require specific constructor arguments)
+                new_value = Exception(f"[{type_.__name__}] {scrubbed_value_str}")
 
             # Preserve traceback and context metadata
             new_value.__traceback__ = tb

utils/llm/dspy_langfuse.py

@@ -277,7 +277,7 @@ def on_lm_end(  # noqa
                         prompt=current_system_prompt + current_prompt,
                         completion=current_completion_content,
                     )
-                except Exception as cost_calc_exception:
+                except (ValueError, KeyError, TypeError) as cost_calc_exception:
                     log.warning(
                         f"litellm.completion_cost failed for model {current_model_name}: {cost_calc_exception}"
                     )
@@ -318,8 +318,8 @@ def on_lm_end(  # noqa
                         usage_details=usage_details_update,
                         cost_details=cost_details_update,
                     )
-            except Exception as e:
-                # This outer try-except catches errors in the token calculation logic itself
+            except (TypeError, ValueError, ZeroDivisionError, AttributeError) as e:
+                # This try-except catches errors in the token calculation logic itself
                 log.warning(f"General failure in usage/cost block: {str(e)}")
                 if level == "DEFAULT":
                     level = "WARNING"
@@ -435,7 +435,7 @@ def on_tool_end(  # noqa
                         output_value = outputs.__dict__
                     else:
                         output_value = str(outputs)
-                except Exception as e:
+                except (TypeError, AttributeError, RecursionError) as e:
                     output_value = {"serialization_error": str(e), "raw": str(outputs)}
 
             tool_span.end(