From 832478f0d01dbef670fb76bae384db71303aaad4 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 24 Feb 2026 17:18:29 +0000 Subject: [PATCH] fix: serve_chat endpoint bug, stale docs, and license mismatch - Fix /serve/chat AttributeError: split Request and ChatRequest params so auth headers are read from HTTP request, not Pydantic body - Add regression tests for the serve_chat endpoint bug - Add agent_core and lightning to pyproject.toml wheel includes - Replace Apache 2.0 LICENSE with MIT to match pyproject.toml - Update test count from "228" to "600+" across README, docs, AGENTS.md - Add 5 missing subsystems to README table (Spark, Creative, Tools, Telegram, agent_core/lightning) - Update AGENTS.md project structure with 6 missing modules - Mark completed v2 roadmap items (personas, MCP tools) in AGENTS.md https://claude.ai/code/session_01GMiccXbo77GkV3TA69x6KS --- AGENTS.md | 10 +- LICENSE | 214 +++------------------------------- README.md | 16 ++- docs/index.html | 10 +- pyproject.toml | 2 + src/timmy_serve/app.py | 8 +- tests/test_timmy_serve_app.py | 97 +++++++++++++++ 7 files changed, 146 insertions(+), 211 deletions(-) create mode 100644 tests/test_timmy_serve_app.py diff --git a/AGENTS.md b/AGENTS.md index 7acbbe8b..99761f51 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -35,10 +35,16 @@ src/ swarm/ # Multi-agent coordinator, registry, bidder, tasks, comms docker_runner.py # Spawn agents as Docker containers timmy_serve/ # L402 Lightning proxy, payment handler, TTS, CLI + spark/ # Intelligence engine — events, predictions, advisory + creative/ # Creative director + video assembler pipeline + tools/ # Git, image, music, video tools for persona agents + lightning/ # Lightning backend abstraction (mock + LND) + agent_core/ # Substrate-agnostic agent interface voice/ # NLU intent detection (regex-based, no cloud) websocket/ # WebSocket manager (ws_manager singleton) notifications/ # Push notification store (notifier singleton) shortcuts/ # Siri Shortcuts API endpoints + telegram_bot/ # Telegram bridge self_tdd/ # Continuous test watchdog tests/ # One test_*.py per module, all mocked static/ # style.css + bg.svg (arcane theme) @@ -309,9 +315,9 @@ make docker-agent # add a Local agent worker **v2.0.0 — Exodus (in progress)** - [x] Persistent swarm state across restarts - [x] Docker infrastructure for agent containers -- [ ] Implement Echo, Mace, Helm, Seer, Forge, Quill persona agents (Dockerised) +- [x] Implement Echo, Mace, Helm, Seer, Forge, Quill persona agents (+ Pixel, Lyra, Reel) +- [x] MCP tool integration for Timmy - [ ] Real LND gRPC backend for `PaymentHandler` (replace mock) -- [ ] MCP tool integration for Timmy - [ ] Marketplace frontend — wire `/marketplace` route to real data **v3.0.0 — Revelation (planned)** diff --git a/LICENSE b/LICENSE index 261eeb9e..16e48f02 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,21 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +MIT License - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +Copyright (c) 2026 Alexander Whitestone - 1. Definitions. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 730e8609..5224df96 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,16 @@ A local-first, sovereign AI agent system. Talk to Timmy, watch his swarm, gate | **Mission Control** | FastAPI + HTMX dashboard — chat, health, swarm, marketplace | | **Swarm** | Multi-agent coordinator — spawn agents, post tasks, run Lightning auctions | | **L402 / Lightning** | Bitcoin Lightning payment gating for API access | +| **Spark Intelligence** | Event capture, predictions, memory consolidation, advisory engine | +| **Creative Studio** | Multi-persona creative pipeline — image, music, video generation | +| **Tools** | Git, image, music, and video tools accessible by persona agents | | **Voice** | NLU intent detection + TTS (pyttsx3, no cloud) | | **WebSocket** | Real-time swarm live feed | | **Mobile** | Responsive layout with full iOS safe-area and touch support | +| **Telegram** | Bridge Telegram messages to Timmy | | **CLI** | `timmy`, `timmy-serve`, `self-tdd` entry points | -**228 tests, 100% passing.** +**600+ tests, 100% passing.** --- @@ -66,7 +70,7 @@ make dev ## Common commands ```bash -make test # run all 228 tests (no Ollama needed) +make test # run all tests (no Ollama needed) make test-cov # test + coverage report make dev # start dashboard (http://localhost:8000) make watch # self-TDD watchdog (60s poll, alerts on regressions) @@ -202,12 +206,18 @@ src/ dashboard/ # FastAPI app, routes, Jinja2 templates swarm/ # Multi-agent: coordinator, registry, bidder, tasks, comms timmy_serve/ # L402 proxy, payment handler, TTS, serve CLI + spark/ # Intelligence engine — events, predictions, advisory + creative/ # Creative director + video assembler pipeline + tools/ # Git, image, music, video tools for persona agents + lightning/ # Lightning backend abstraction (mock + LND) + agent_core/ # Substrate-agnostic agent interface voice/ # NLU intent detection websocket/ # WebSocket connection manager notifications/ # Push notification store shortcuts/ # Siri Shortcuts endpoints + telegram_bot/ # Telegram bridge self_tdd/ # Continuous test watchdog -tests/ # 228 tests — one file per module, all mocked +tests/ # 600+ tests — one file per module, all mocked static/style.css # Dark mission-control theme (JetBrains Mono) docs/ # GitHub Pages landing page AGENTS.md # AI agent development standards ← read this diff --git a/docs/index.html b/docs/index.html index 4ae7d7aa..0c7494a5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -566,7 +566,7 @@ gate API access with Bitcoin Lightning — no cloud, no telemetry, no compromise.

- 228 Tests Passing + 600+ Tests Passing FastAPI + HTMX Lightning L402 No Cloud @@ -582,7 +582,7 @@
-
228
+
600+
Tests Passing
@@ -590,7 +590,7 @@
API Endpoints
-
11
+
15
Subsystems
@@ -780,7 +780,7 @@ External: Ollama :11434 · optional Redis · optional LND gRPC
5

Test

- 
make test        # 228 tests — no Ollama needed
+        
make test        # 600+ tests — no Ollama needed
 make test-cov    # + coverage report
 make watch       # self-TDD watchdog in background
@@ -870,7 +870,7 @@ External: Ollama :11434 · optional Redis · optional LND gRPC
✓ Complete

Foundation

-

Agno + Ollama + SQLite + FastAPI dashboard + HTMX + 228 tests. +

Agno + Ollama + SQLite + FastAPI dashboard + HTMX + full test suite. CLI, mobile layout, Bootstrap, CI/CD, AirLLM big-brain backend.

diff --git a/pyproject.toml b/pyproject.toml index a5150d35..b1900cff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -87,6 +87,8 @@ include = [ "src/spark", "src/tools", "src/creative", + "src/agent_core", + "src/lightning", ] [tool.pytest.ini_options] diff --git a/src/timmy_serve/app.py b/src/timmy_serve/app.py index 2ac198a5..146dcd47 100644 --- a/src/timmy_serve/app.py +++ b/src/timmy_serve/app.py @@ -158,18 +158,18 @@ def create_timmy_serve_app(price_sats: int = DEFAULT_PRICE_SATS) -> FastAPI: ) @app.post("/serve/chat", response_model=ChatResponse) - async def serve_chat(request: ChatRequest): + async def serve_chat(request: Request, body: ChatRequest): """Process a chat request (L402-gated). - + Requires valid L402 token in Authorization header: Authorization: L402 : """ try: # Create Timmy agent and process request timmy = create_timmy() - result = timmy.run(request.message, stream=False) + result = timmy.run(body.message, stream=False) response_text = result.content if hasattr(result, "content") else str(result) - + # Get payment hash from Authorization header for receipt auth_header = request.headers.get("authorization", "") payment_hash = None diff --git a/tests/test_timmy_serve_app.py b/tests/test_timmy_serve_app.py new file mode 100644 index 00000000..cd24e5e9 --- /dev/null +++ b/tests/test_timmy_serve_app.py @@ -0,0 +1,97 @@ +"""Tests for timmy_serve/app.py — Serve FastAPI app and endpoints.""" + +from unittest.mock import MagicMock, patch + +import pytest +from fastapi.testclient import TestClient + + +@pytest.fixture +def serve_client(): + """Create a TestClient for the timmy-serve app.""" + from timmy_serve.app import create_timmy_serve_app + + app = create_timmy_serve_app(price_sats=100) + return TestClient(app) + + +class TestHealthEndpoint: + def test_health_returns_ok(self, serve_client): + resp = serve_client.get("/health") + assert resp.status_code == 200 + data = resp.json() + assert data["status"] == "healthy" + assert data["service"] == "timmy-serve" + + +class TestServeStatus: + def test_status_returns_pricing(self, serve_client): + resp = serve_client.get("/serve/status") + assert resp.status_code == 200 + data = resp.json() + assert data["price_sats"] == 100 + assert "total_invoices" in data + assert "total_earned_sats" in data + + +class TestServeChatEndpoint: + """Regression tests for /serve/chat. + + The original implementation declared ``async def serve_chat(request: ChatRequest)`` + which shadowed FastAPI's ``Request`` object. Calling ``request.headers`` on a + Pydantic model raised ``AttributeError``. The fix splits the parameters into + ``request: Request`` (FastAPI) and ``body: ChatRequest`` (Pydantic). + """ + + def test_chat_without_auth_returns_402(self, serve_client): + """Unauthenticated request should get a 402 challenge.""" + resp = serve_client.post( + "/serve/chat", + json={"message": "Hello"}, + ) + assert resp.status_code == 402 + data = resp.json() + assert data["error"] == "Payment Required" + assert "macaroon" in data + assert "invoice" in data + + @patch("timmy_serve.app.create_timmy") + @patch("timmy_serve.app.verify_l402_token", return_value=True) + def test_chat_with_valid_l402_token(self, mock_verify, mock_create, serve_client): + """Authenticated request should reach the chat handler without AttributeError.""" + mock_agent = MagicMock() + mock_result = MagicMock() + mock_result.content = "I am Timmy." + mock_agent.run.return_value = mock_result + mock_create.return_value = mock_agent + + resp = serve_client.post( + "/serve/chat", + json={"message": "Who are you?"}, + headers={"Authorization": "L402 fake-macaroon:fake-preimage"}, + ) + # The key assertion: we must NOT get a 500 from AttributeError + assert resp.status_code == 200 + data = resp.json() + assert data["response"] == "I am Timmy." + mock_agent.run.assert_called_once_with("Who are you?", stream=False) + + @patch("timmy_serve.app.create_timmy") + @patch("timmy_serve.app.verify_l402_token", return_value=True) + def test_chat_reads_auth_header_from_request( + self, mock_verify, mock_create, serve_client + ): + """Ensure auth header is read from the HTTP Request, not the JSON body.""" + mock_agent = MagicMock() + mock_result = MagicMock() + mock_result.content = "ok" + mock_agent.run.return_value = mock_result + mock_create.return_value = mock_agent + + resp = serve_client.post( + "/serve/chat", + json={"message": "test"}, + headers={"Authorization": "L402 abc:def"}, + ) + assert resp.status_code == 200 + # Should not raise AttributeError on request.headers