amfs-adapter-postgres 0.2.0__tar.gz → 0.2.2__tar.gz

{amfs_adapter_postgres-0.2.0 → amfs_adapter_postgres-0.2.2}/.gitignore

@@ -17,3 +17,6 @@ test.py
 
 # pytest temp dirs (created when basetemp lands in the repo)
 pytest-of-*/
+
+# macOS finder metadata, committed three times by accident already.
+.DS_Store

{amfs_adapter_postgres-0.2.0 → amfs_adapter_postgres-0.2.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.5
 Name: amfs-adapter-postgres
-Version: 0.2.0
+Version: 0.2.2
 Summary: AMFS Postgres adapter with back-propagation triggers
 License-Expression: Apache-2.0
 Requires-Python: >=3.11
-Requires-Dist: amfs-core>=0.3.13
+Requires-Dist: amfs-core>=0.3.14
 Requires-Dist: psycopg-pool>=3.1
 Requires-Dist: psycopg[binary]<4,>=3.1

{amfs_adapter_postgres-0.2.0 → amfs_adapter_postgres-0.2.2}/pyproject.toml

@@ -1,12 +1,13 @@
 [project]
 name = "amfs-adapter-postgres"
-version = "0.2.0"
+version = "0.2.2"
 description = "AMFS Postgres adapter with back-propagation triggers"
 requires-python = ">=3.11"
 license = "Apache-2.0"
 dependencies = [
-    # 0.3.13 adds the capture fields this adapter now persists and selects back.
-    "amfs-core>=0.3.13",
+    # 0.3.14 adds the capture fields this adapter now persists and selects back,
+    # tool_calls among them.
+    "amfs-core>=0.3.14",
     "psycopg[binary]>=3.1,<4",
     "psycopg-pool>=3.1",
 ]

{amfs_adapter_postgres-0.2.0 → amfs_adapter_postgres-0.2.2}/src/amfs_postgres/adapter.py

@@ -60,7 +60,9 @@ from amfs_core.models import (
     QueryEvent,
     SearchQuery,
     SemanticQuery,
+    SessionMetadata,
     Tag,
+    ToolCall,
     TraceEntry,
 )
 
@@ -603,6 +605,12 @@ class PostgresAdapter(AdapterABC):
             ALTER TABLE amfs_decision_traces
             ADD COLUMN IF NOT EXISTS response_text TEXT
         """)
+        # The action side of that pair. Training predicts the action from the
+        # request, so a trace carrying only the request is half an example.
+        cur.execute("""
+            ALTER TABLE amfs_decision_traces
+            ADD COLUMN IF NOT EXISTS tool_calls JSONB DEFAULT '[]'
+        """)
         # Entry-to-trace resolution for knowledge lineage. The shared session id
         # is the only link from a written entry back to the trace that committed
         # it, since causal_entries records reads rather than writes.
@@ -2539,7 +2547,7 @@ class PostgresAdapter(AdapterABC):
                 cur.execute(
                     """
                     SELECT id, agent_id, session_id, outcome_ref, outcome_type,
-                           decision_summary, task_input, response_text,
+                           decision_summary, task_input, response_text, tool_calls,
                            causal_entries, external_contexts,
                            query_events, session_started_at, session_ended_at,
                            session_duration_ms,
@@ -2567,10 +2575,10 @@ class PostgresAdapter(AdapterABC):
                          query_events, session_started_at, session_ended_at,
                          session_duration_ms,
                          error_events, state_diff, session_metadata, created_at,
-                         task_input, response_text)
+                         task_input, response_text, tool_calls)
                     VALUES (%s, %s, %s, %s, %s, %s, %s::jsonb, %s::jsonb,
                             %s::jsonb, %s, %s, %s, %s::jsonb, %s::jsonb, %s::jsonb, %s,
-                            %s, %s)
+                            %s, %s, %s::jsonb)
                     RETURNING id, created_at
                     """,
                     (
@@ -2588,10 +2596,22 @@ class PostgresAdapter(AdapterABC):
                         trace.session_duration_ms,
                         json.dumps([e.model_dump(mode="json") for e in trace.error_events]),
                         json.dumps(trace.state_diff.model_dump(mode="json")) if trace.state_diff else None,
-                        json.dumps(trace.session_metadata) if trace.session_metadata else "{}",
+                        # Dumped like every other model field on this row. The
+                        # field is typed, so anything arriving over
+                        # ``POST /api/v1/traces`` is a ``SessionMetadata`` by the
+                        # time it reaches here and ``json.dumps`` cannot encode
+                        # it — the trace was lost with a 500. A plain dict still
+                        # gets through ``model_copy(update=...)``, which does not
+                        # validate, so both shapes are accepted.
+                        json.dumps(
+                            trace.session_metadata.model_dump(mode="json")
+                            if isinstance(trace.session_metadata, SessionMetadata)
+                            else trace.session_metadata
+                        ) if trace.session_metadata else "{}",
                         trace.created_at,
                         trace.task_input,
                         trace.response_text,
+                        json.dumps([t.model_dump(mode="json") for t in trace.tool_calls]),
                     ),
                 )
                 row = cur.fetchone()
@@ -2624,7 +2644,7 @@ class PostgresAdapter(AdapterABC):
         where = " AND ".join(conditions)
         sql = f"""
             SELECT id, agent_id, session_id, outcome_ref, outcome_type,
-                   decision_summary, task_input, response_text,
+                   decision_summary, task_input, response_text, tool_calls,
                    causal_entries, external_contexts,
                    query_events, session_started_at, session_ended_at,
                    session_duration_ms,
@@ -2827,7 +2847,10 @@ class PostgresAdapter(AdapterABC):
         ec_raw = row["external_contexts"] or []
         qe_raw = row.get("query_events") or []
         ee_raw = row.get("error_events") or []
+        tc_raw = row.get("tool_calls") or []
         sd_raw = row.get("state_diff")
+        if isinstance(tc_raw, str):
+            tc_raw = json.loads(tc_raw)
         if isinstance(ce_raw, str):
             ce_raw = json.loads(ce_raw)
         if isinstance(ec_raw, str):
@@ -2856,6 +2879,7 @@ class PostgresAdapter(AdapterABC):
             decision_summary=row.get("decision_summary"),
             task_input=row.get("task_input"),
             response_text=row.get("response_text"),
+            tool_calls=[ToolCall(**t) for t in tc_raw],
             causal_entries=[TraceEntry(**e) for e in ce_raw],
             external_contexts=[ExternalContext(**c) for c in ec_raw],
             query_events=[QueryEvent(**q) for q in qe_raw],

{amfs_adapter_postgres-0.2.0 → amfs_adapter_postgres-0.2.2}/src/amfs_postgres/schema.sql

@@ -60,6 +60,7 @@ CREATE TABLE IF NOT EXISTS amfs_decision_traces (
     decision_summary TEXT,
     task_input TEXT,
     response_text TEXT,
+    tool_calls JSONB DEFAULT '[]',
     causal_entries JSONB DEFAULT '[]',
     external_contexts JSONB DEFAULT '[]',
     query_events JSONB DEFAULT '[]',