fix(general): use dulwich, basic dockerfile, config improvements (#87)

Author: dineshpinto

.dockerignore

@@ -0,0 +1,22 @@
+# Envs
+.venv
+.venv*/
+.env
+.env.*
+.ruff_cache
+.pytest_cache
+.vscode
+.DS_Store
+
+# Python-generated files
+__pycache__/
+*.py[oc]
+build/
+dist/
+wheels/
+*.egg-info
+
+# Other folders
+docs/
+examples/
+tests/

Dockerfile

@@ -0,0 +1,27 @@
+# Add <builder-digest> in prod
+FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim AS builder
+ENV UV_COMPILE_BYTECODE=1 \
+    UV_LINK_MODE=copy \
+    UV_PYTHON_DOWNLOADS=0
+WORKDIR /app
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    uv sync --locked --no-install-project --all-extras --no-dev --no-editable
+COPY . /app
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked --all-extras --no-dev --no-editable
+RUN rm -rf /root/.cache/uv /root/.cache/pip
+
+# Add <runtime-digest> in prod
+FROM python:3.12-slim-bookworm AS runtime
+
+ENV PIP_NO_CACHE_DIR=1 \
+    UV_PYTHON_DOWNLOADS=0
+RUN groupadd -r app && \
+    useradd -r -g app -d /nonexistent -s /usr/sbin/nologin app
+USER app
+WORKDIR /app
+COPY --from=builder --chown=app:app /app /app
+ENV PATH="/app/.venv/bin:$PATH"
+CMD ["/app/.venv/bin/flare-ai-kit"]

examples/a2a/a2a_collaboration/ftso_agent.py

@@ -147,7 +147,7 @@ async def handle_send_message(request_body: SendMessageRequest) -> SendMessageRe
             if part.kind == "text":
                 user_message += part.text
 
-        kit = FlareAIKit()
+        kit = FlareAIKit(config=None)  # Use default settings
         deps = AgentDependencies(flare_kit=kit)
 
         result = await price_agent.run(user_message, deps=deps)

examples/a2a/a2a_collaboration/orchestrator_agent.py

@@ -1,5 +1,6 @@
 import asyncio
 import os
+from pathlib import Path
 from uuid import uuid4
 
 import structlog
@@ -16,6 +17,7 @@
     SendMessageRequest,
     TextPart,
 )
+from flare_ai_kit.a2a.settings import A2ASettings
 
 load_dotenv()
 
@@ -184,7 +186,8 @@ async def route_workflow(
 
     async def main() -> None:
         """Async entrypoint for orchestrator agent."""
-        client = A2AClient(db_path="orchestrator-agent-client.db")
+        settings = A2ASettings(sqlite_db_path=Path("orchestrator-agent.db"))
+        client = A2AClient(settings=settings)
 
         await client.discover(
             [

examples/a2a/messaging/ping_pong.py

@@ -1,4 +1,5 @@
 import asyncio
+from pathlib import Path
 
 from flare_ai_kit.a2a import A2AClient
 from flare_ai_kit.a2a.schemas import (
@@ -7,6 +8,7 @@
     SendMessageRequest,
     TextPart,
 )
+from flare_ai_kit.a2a.settings import A2ASettings
 
 
 async def main() -> None:
@@ -15,7 +17,8 @@ async def main() -> None:
         "https://system-integration.telex.im/ping_pong_agent/.well-known/agent.json"
     )
     agent_base_url = agent_card_url.split(".well-known")[0]
-    client = A2AClient(db_path="tasks.db")
+    settings = A2ASettings(sqlite_db_path=Path("tasks.db"))
+    client = A2AClient(settings=settings)
 
     message = SendMessageRequest(
         params=MessageSendParams(

pyproject.toml

@@ -42,12 +42,12 @@ Releases = "https://github.com/flare-foundation/flare-ai-kit/releases"
 Issues = "https://github.com/flare-foundation/flare-ai-kit/issues"
 
 [project.scripts]
-flare-ai-kit = "flare_ai_kit:main"
+flare-ai-kit = "flare_ai_kit.main:start"
 
 [project.optional-dependencies]
 rag = [
     "qdrant-client>=1.13.3",
-    "gitpython>=3.1.44",
+    "dulwich>=0.23.2",
 ]
 social = [
     "python-telegram-bot>=22.0",
@@ -100,4 +100,4 @@ typeCheckingMode = "strict"
 
 [tool.pytest.ini_options]
 asyncio_mode = "strict"
-asyncio_default_fixture_loop_scope = "function"
+asyncio_default_fixture_loop_scope = "function"

src/flare_ai_kit/a2a/client.py

@@ -17,6 +17,8 @@
 from flare_ai_kit.a2a.task_management import TaskManager
 from flare_ai_kit.common import A2AClientError
 
+from .settings import A2ASettings
+
 if TYPE_CHECKING:
     from collections.abc import Coroutine
 
@@ -31,16 +33,17 @@ class A2AClient:
     3. performing task management,
     """
 
-    def __init__(self, db_path: str = ".", http_client_timeout: float = 30.0) -> None:
+    def __init__(self, settings: A2ASettings) -> None:
         """Initialize the A2A client with SQLite database for task tracking."""
-        self.db_path = db_path
-        self.task_manager = TaskManager(db_path)
+        self.sqlite_db_path = settings.sqlite_db_path
+        self.client_timeout = settings.client_timeout
+        self.task_manager = TaskManager(self.sqlite_db_path)
         self.agent_cards: dict[str, AgentCard] = {}
         self.available_skills: list[AgentSkill] = []
         self.skill_to_agents: dict[
             str, list[str]
         ] = {}  # skill name -> list of agent URLs
-        self.http_client = httpx.AsyncClient(timeout=http_client_timeout)
+        self.http_client = httpx.AsyncClient(timeout=self.client_timeout)
 
     async def send_message(
         self,

src/flare_ai_kit/a2a/settings.py

@@ -0,0 +1,24 @@
+"""Settings for A2A."""
+
+from pathlib import Path
+
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class A2ASettings(BaseSettings):
+    """Configuration specific to the Flare ecosystem interactions."""
+
+    model_config = SettingsConfigDict(
+        env_prefix="A2A__",
+        env_file=".env",
+        extra="ignore",
+    )
+    sqlite_db_path: Path = Field(
+        default=Path.cwd() / "flare_a2a.db",
+        description="Use a pregenerated attestation token for testing.",
+    )
+    client_timeout: float = Field(
+        default=30.0,
+        description="Timeout for HTTP requests to A2A servers.",
+    )

src/flare_ai_kit/a2a/task_management.py

@@ -7,6 +7,7 @@
 
 import sqlite3
 import uuid
+from pathlib import Path
 from typing import ClassVar
 
 from flare_ai_kit.a2a.schemas import Task, TaskState, TaskStatus
@@ -23,7 +24,7 @@ class TaskManager:
         TaskState.unknown,
     ]
 
-    def __init__(self, db_path: str = "tasks.db") -> None:
+    def __init__(self, db_path: Path = Path("flare_a2a.db")) -> None:
         """Init method for the task manager."""
         self.db_path = db_path
         self.connection = sqlite3.connect(db_path)

src/flare_ai_kit/config.py

@@ -5,6 +5,7 @@
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
+from flare_ai_kit.a2a.settings import A2ASettings
 from flare_ai_kit.agent.settings import AgentSettings
 from flare_ai_kit.ecosystem.settings import EcosystemSettings
 from flare_ai_kit.ingestion.settings import IngestionSettings
@@ -36,3 +37,4 @@ class AppSettings(BaseSettings):
     social: SocialSettings = Field(default_factory=SocialSettings)  # pyright: ignore[reportArgumentType,reportUnknownVariableType]
     tee: TeeSettings = Field(default_factory=TeeSettings)  # pyright: ignore[reportArgumentType,reportUnknownVariableType]
     ingestion: IngestionSettings = Field(default_factory=IngestionSettings)  # pyright: ignore[reportArgumentType,reportUnknownVariableType]
+    a2a: A2ASettings = Field(default_factory=A2ASettings)  # pyright: ignore[reportArgumentType,reportUnknownVariableType]