gaard-core 0.2.8__tar.gz → 0.2.10__tar.gz

{gaard_core-0.2.8 → gaard_core-0.2.10}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: gaard-core
-Version: 0.2.8
+Version: 0.2.10
 Summary: Core GAARD query pipeline, prompt compiler, policies and SQL validation
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: gaard-plugin-api<0.3.0,>=0.2.8
+Requires-Dist: gaard-plugin-api<0.3.0,>=0.2.10
 Requires-Dist: pydantic>=2.7.0
 Requires-Dist: sqlglot>=25.0.0
 Provides-Extra: dev

{gaard_core-0.2.8 → gaard_core-0.2.10}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gaard-core"
-version = "0.2.8"
+version = "0.2.10"
 description = "Core GAARD query pipeline, prompt compiler, policies and SQL validation"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "gaard-plugin-api>=0.2.8,<0.3.0",
+    "gaard-plugin-api>=0.2.10,<0.3.0",
     "pydantic>=2.7.0",
     "sqlglot>=25.0.0",
 ]
@@ -25,5 +25,8 @@ dev = [
 line-length = 100
 target-version = "py311"
 
+[tool.ruff.flake8-bugbear]
+extend-immutable-calls = ["fastapi.Depends", "fastapi.param_functions.Depends", "fastapi.params.Depends"]
+
 [tool.setuptools.packages.find]
 where = ["src"]

{gaard_core-0.2.8 → gaard_core-0.2.10}/src/gaard_core/conversation_context/llm_classifier.py

@@ -1,6 +1,9 @@
 import json
 from typing import Any, Protocol, cast
 
+from gaard_llm.openai_compatible.client import OpenAICompatibleClient
+from gaard_llm.providers.models import ChatCompletionRequest, ChatMessage
+
 from gaard_core.llm_output import remove_thinking_blocks
 from gaard_core.prompt_compiler.conversation_context_prompt import (
     ConversationContextPromptCompiler,
@@ -11,8 +14,6 @@ from gaard_core.query_pipeline.models import (
     ConversationContextDecision,
     QueryRequest,
 )
-from gaard_llm.openai_compatible.client import OpenAICompatibleClient
-from gaard_llm.providers.models import ChatCompletionRequest, ChatMessage
 
 
 class ConversationContextPromptCompilerProtocol(Protocol):

{gaard_core-0.2.8 → gaard_core-0.2.10}/src/gaard_core/conversation_context/mock_classifier.py

@@ -7,7 +7,6 @@ from gaard_core.query_pipeline.models import (
     QueryRequest,
 )
 
-
 FOLLOW_UP_PREFIXES = (
     "a ",
     "and ",

{gaard_core-0.2.8 → gaard_core-0.2.10}/src/gaard_core/query_intent/llm_classifier.py

@@ -1,6 +1,9 @@
 import json
 from typing import Any, Protocol, cast
 
+from gaard_llm.openai_compatible.client import OpenAICompatibleClient
+from gaard_llm.providers.models import ChatCompletionRequest, ChatMessage
+
 from gaard_core.llm_output import remove_thinking_blocks
 from gaard_core.prompt_compiler.intent_classification_prompt import (
     IntentClassificationPromptCompiler,
@@ -11,8 +14,6 @@ from gaard_core.query_pipeline.models import (
     QueryIntentDecision,
     QueryRequest,
 )
-from gaard_llm.openai_compatible.client import OpenAICompatibleClient
-from gaard_llm.providers.models import ChatCompletionRequest, ChatMessage
 
 
 class IntentPromptCompiler(Protocol):

{gaard_core-0.2.8 → gaard_core-0.2.10}/src/gaard_core/query_pipeline/pipeline.py

@@ -3,9 +3,9 @@ import time
 from collections.abc import Callable
 from typing import Protocol
 
+from gaard_core.errors import LlmProviderError, QueryPipelineStepError
 from gaard_core.execution.mock_executor import MockQueryExecutor
 from gaard_core.query_pipeline.mock_sql_generator import MockSqlGenerator
-from gaard_core.errors import LlmProviderError, QueryPipelineStepError
 from gaard_core.query_pipeline.models import (
     GeneratedSql,
     OutputClassification,
@@ -17,7 +17,6 @@ from gaard_core.result_classifier.mock_classifier import MockResultClassifier
 from gaard_core.result_interpreter.mock_interpreter import MockResultInterpreter
 from gaard_core.sql_validator.select_only import SelectOnlySqlValidator
 
-
 logger = logging.getLogger(__name__)
 
 

{gaard_core-0.2.8 → gaard_core-0.2.10}/src/gaard_core/result_classifier/llm_classifier.py

@@ -1,14 +1,15 @@
 import json
 from typing import Any, Protocol
 
+from gaard_llm.openai_compatible.client import OpenAICompatibleClient
+from gaard_llm.providers.models import ChatCompletionRequest, ChatMessage
+
 from gaard_core.llm_output import remove_thinking_blocks
 from gaard_core.prompt_compiler.models import CompiledPrompt
 from gaard_core.prompt_compiler.result_classification_prompt import (
     ResultClassificationPromptCompiler,
 )
 from gaard_core.query_pipeline.models import OutputClassification, QueryRequest
-from gaard_llm.openai_compatible.client import OpenAICompatibleClient
-from gaard_llm.providers.models import ChatCompletionRequest, ChatMessage
 
 
 class ClassificationPromptCompiler(Protocol):

{gaard_core-0.2.8 → gaard_core-0.2.10}/src/gaard_core/result_interpreter/llm_interpreter.py

@@ -1,13 +1,14 @@
 from typing import Any, Protocol
 
+from gaard_llm.openai_compatible.client import OpenAICompatibleClient
+from gaard_llm.providers.models import ChatCompletionRequest, ChatMessage
+
 from gaard_core.llm_output import remove_thinking_blocks
 from gaard_core.prompt_compiler.models import CompiledPrompt
 from gaard_core.prompt_compiler.result_interpretation_prompt import (
     ResultInterpretationPromptCompiler,
 )
 from gaard_core.query_pipeline.models import QueryRequest, QueryResult
-from gaard_llm.openai_compatible.client import OpenAICompatibleClient
-from gaard_llm.providers.models import ChatCompletionRequest, ChatMessage
 
 
 class ResultPromptCompiler(Protocol):

{gaard_core-0.2.8 → gaard_core-0.2.10}/src/gaard_core.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: gaard-core
-Version: 0.2.8
+Version: 0.2.10
 Summary: Core GAARD query pipeline, prompt compiler, policies and SQL validation
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: gaard-plugin-api<0.3.0,>=0.2.8
+Requires-Dist: gaard-plugin-api<0.3.0,>=0.2.10
 Requires-Dist: pydantic>=2.7.0
 Requires-Dist: sqlglot>=25.0.0
 Provides-Extra: dev

{gaard_core-0.2.8 → gaard_core-0.2.10}/src/gaard_core.egg-info/requires.txt

@@ -1,4 +1,4 @@
-gaard-plugin-api<0.3.0,>=0.2.8
+gaard-plugin-api<0.3.0,>=0.2.10
 pydantic>=2.7.0
 sqlglot>=25.0.0
 

{gaard_core-0.2.8 → gaard_core-0.2.10}/tests/test_conversation_context_classifier.py

@@ -1,10 +1,14 @@
+from typing import cast
+
+from gaard_llm.openai_compatible.client import OpenAICompatibleClient
+from gaard_llm.providers.models import ChatCompletionRequest, ChatCompletionResponse
+
 from gaard_core.conversation_context.llm_classifier import (
     LlmConversationContextClassifier,
     parse_conversation_context_classification,
 )
 from gaard_core.conversation_context.mock_classifier import MockConversationContextClassifier
 from gaard_core.query_pipeline.models import ConversationContextDecision, QueryRequest
-from gaard_llm.providers.models import ChatCompletionResponse
 
 
 def test_parse_conversation_context_classification_handles_aliases_and_invalid_values() -> None:
@@ -32,9 +36,9 @@ def test_parse_conversation_context_classification_handles_aliases_and_invalid_v
 def test_llm_conversation_context_classifier_exposes_prompt_and_standalone_follow_up() -> None:
     class FakeClient:
         def __init__(self) -> None:
-            self.request = None
+            self.request: ChatCompletionRequest | None = None
 
-        def create_chat_completion(self, request):
+        def create_chat_completion(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
             self.request = request
             return ChatCompletionResponse(
                 content=(
@@ -46,7 +50,7 @@ def test_llm_conversation_context_classifier_exposes_prompt_and_standalone_follo
 
     client = FakeClient()
     classifier = LlmConversationContextClassifier(
-        client=client,
+        client=cast(OpenAICompatibleClient, client),
         model="test-model",
     )
 

{gaard_core-0.2.8 → gaard_core-0.2.10}/tests/test_json_utils.py

@@ -1,4 +1,4 @@
-from datetime import date, datetime
+from datetime import UTC, date, datetime
 from decimal import Decimal
 
 from gaard_core.json_utils import json_dumps, to_jsonable
@@ -7,10 +7,10 @@ from gaard_core.json_utils import json_dumps, to_jsonable
 def test_to_jsonable_normalizes_common_database_values() -> None:
     assert to_jsonable(
         {
-            "integer_decimal": Decimal("30"),
+            "integer_decimal": Decimal(30),
             "fractional_decimal": Decimal("30.5"),
             "event_date": date(2026, 5, 24),
-            "event_time": datetime(2026, 5, 24, 9, 30),
+            "event_time": datetime(2026, 5, 24, 9, 30, tzinfo=UTC).replace(tzinfo=None),
             "payload": b"ok",
             "binary_payload": b"\xff",
         }
@@ -25,6 +25,6 @@ def test_to_jsonable_normalizes_common_database_values() -> None:
 
 
 def test_json_dumps_serializes_common_database_values() -> None:
-    payload = {"rows": [{"total_minutes": Decimal("42")}]}
+    payload = {"rows": [{"total_minutes": Decimal(42)}]}
 
     assert '"total_minutes": 42' in json_dumps(payload)

{gaard_core-0.2.8 → gaard_core-0.2.10}/tests/test_llm_query_intent_classifier.py

@@ -1,13 +1,17 @@
+from typing import cast
+
+from gaard_llm.openai_compatible.client import OpenAICompatibleClient
+from gaard_llm.providers.models import ChatCompletionRequest, ChatCompletionResponse
+
 from gaard_core.query_intent.llm_classifier import (
     LlmQueryIntentClassifier,
     parse_query_intent_classification,
 )
 from gaard_core.query_pipeline.models import QueryIntentDecision, QueryRequest
-from gaard_llm.providers.models import ChatCompletionResponse
 
 
 class FakeLlmClient:
-    def create_chat_completion(self, request):
+    def create_chat_completion(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
         return ChatCompletionResponse(
             content=(
                 '{"decision":"write_or_mutation_request",'
@@ -21,9 +25,9 @@ class FakeLlmClient:
 
 class CapturingLlmClient:
     def __init__(self) -> None:
-        self.requests = []
+        self.requests: list[ChatCompletionRequest] = []
 
-    def create_chat_completion(self, request):
+    def create_chat_completion(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
         self.requests.append(request)
 
         return ChatCompletionResponse(
@@ -35,7 +39,7 @@ class CapturingLlmClient:
 
 def test_llm_query_intent_classifier_returns_model_decision() -> None:
     classifier = LlmQueryIntentClassifier(
-        client=FakeLlmClient(),  # type: ignore[arg-type]
+        client=cast(OpenAICompatibleClient, FakeLlmClient()),
         model="test-model",
     )
 
@@ -56,7 +60,7 @@ def test_llm_query_intent_classifier_returns_model_decision() -> None:
 def test_llm_query_intent_classifier_sends_provider_extra_body() -> None:
     client = CapturingLlmClient()
     classifier = LlmQueryIntentClassifier(
-        client=client,  # type: ignore[arg-type]
+        client=cast(OpenAICompatibleClient, client),
         model="test-model",
         extra_body={
             "chat_template_kwargs": {

{gaard_core-0.2.8 → gaard_core-0.2.10}/tests/test_llm_result_classifier.py

@@ -1,13 +1,14 @@
+from gaard_llm.providers.models import ChatCompletionRequest, ChatCompletionResponse
+
 from gaard_core.query_pipeline.models import OutputClassification, QueryRequest
 from gaard_core.result_classifier.llm_classifier import (
     LlmResultClassifier,
     parse_output_classification,
 )
-from gaard_llm.providers.models import ChatCompletionResponse
 
 
 class FakeLlmClient:
-    def create_chat_completion(self, request):
+    def create_chat_completion(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
         return ChatCompletionResponse(
             content='{"output_classification": "personal_data"}',
             model="test-model",
@@ -17,9 +18,9 @@ class FakeLlmClient:
 
 class CapturingLlmClient:
     def __init__(self) -> None:
-        self.requests = []
+        self.requests: list[ChatCompletionRequest] = []
 
-    def create_chat_completion(self, request):
+    def create_chat_completion(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
         self.requests.append(request)
 
         return ChatCompletionResponse(

{gaard_core-0.2.8 → gaard_core-0.2.10}/tests/test_llm_result_interpreter.py

@@ -1,10 +1,11 @@
+from gaard_llm.providers.models import ChatCompletionRequest, ChatCompletionResponse
+
 from gaard_core.query_pipeline.models import QueryRequest, QueryResult
 from gaard_core.result_interpreter.llm_interpreter import LlmResultInterpreter
-from gaard_llm.providers.models import ChatCompletionResponse
 
 
 class FakeLlmClient:
-    def create_chat_completion(self, request):
+    def create_chat_completion(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
         return ChatCompletionResponse(
             content="W bazie znajduje się 4 aktywnych pacjentów.",
             model="test-model",
@@ -14,9 +15,9 @@ class FakeLlmClient:
 
 class CapturingLlmClient:
     def __init__(self) -> None:
-        self.requests = []
+        self.requests: list[ChatCompletionRequest] = []
 
-    def create_chat_completion(self, request):
+    def create_chat_completion(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
         self.requests.append(request)
 
         return ChatCompletionResponse(
@@ -46,7 +47,7 @@ def test_llm_result_interpreter_returns_model_content() -> None:
 
 def test_llm_result_interpreter_removes_thinking_blocks() -> None:
     class ThinkingFakeLlmClient:
-        def create_chat_completion(self, request):
+        def create_chat_completion(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
             return ChatCompletionResponse(
                 content=(
                     "<think>\n"

{gaard_core-0.2.8 → gaard_core-0.2.10}/tests/test_llm_sql_generator.py

@@ -1,13 +1,14 @@
+from gaard_llm.providers.models import ChatCompletionRequest, ChatCompletionResponse
+
 from gaard_core.query_pipeline.llm_sql_generator import LlmSqlGenerator
 from gaard_core.query_pipeline.models import QueryRequest
-from gaard_llm.providers.models import ChatCompletionResponse
 
 
 class CapturingClient:
     def __init__(self) -> None:
-        self.requests = []
+        self.requests: list[ChatCompletionRequest] = []
 
-    def create_chat_completion(self, request):
+    def create_chat_completion(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
         self.requests.append(request)
 
         return ChatCompletionResponse(

{gaard_core-0.2.8 → gaard_core-0.2.10}/tests/test_query_pipeline.py

@@ -1,7 +1,12 @@
 import pytest
 
 from gaard_core.errors import LlmProviderError, QueryPipelineStepError
-from gaard_core.query_pipeline.models import GeneratedSql, QueryRequest, QueryResult
+from gaard_core.query_pipeline.models import (
+    GeneratedSql,
+    OutputClassification,
+    QueryRequest,
+    QueryResult,
+)
 from gaard_core.query_pipeline.pipeline import QueryPipeline
 
 
@@ -46,7 +51,7 @@ class FailingInterpreter:
 
 
 class FailingClassifier:
-    def classify(self, request: QueryRequest, answer: str):
+    def classify(self, request: QueryRequest, answer: str) -> OutputClassification:
         raise AssertionError("classifier should not be called")
 
 

{gaard_core-0.2.8 → gaard_core-0.2.10}/tests/test_schema_context_service.py

@@ -1,5 +1,5 @@
-from gaard_core.schema.context import SchemaContextService
 from gaard_core.schema.cache import SchemaContextCache
+from gaard_core.schema.context import SchemaContextService
 from gaard_core.schema.models import ColumnInfo, DatabaseSchema, TableInfo
 
 

{gaard_core-0.2.8 → gaard_core-0.2.10}/src/gaard_core/query_pipeline/llm_sql_generator.py

@@ -1,13 +1,13 @@
 import logging
 from typing import Any, Protocol
 
-from gaard_core.prompt_compiler.models import CompiledPrompt, SqlGenerationPromptRequest
-from gaard_core.prompt_compiler.sql_generation_prompt import SqlGenerationPromptCompiler
-from gaard_core.llm_output import remove_thinking_blocks
-from gaard_core.query_pipeline.models import GeneratedSql, QueryRequest
 from gaard_llm.openai_compatible.client import OpenAICompatibleClient
 from gaard_llm.providers.models import ChatCompletionRequest, ChatMessage
 
+from gaard_core.llm_output import remove_thinking_blocks
+from gaard_core.prompt_compiler.models import CompiledPrompt, SqlGenerationPromptRequest
+from gaard_core.prompt_compiler.sql_generation_prompt import SqlGenerationPromptCompiler
+from gaard_core.query_pipeline.models import GeneratedSql, QueryRequest
 
 logger = logging.getLogger(__name__)