From 9b36a3a74a0d01413233e6933a4b096a81584b49 Mon Sep 17 00:00:00 2001 From: Chris Latimer Date: Sat, 22 Nov 2025 14:05:07 -0700 Subject: [PATCH] Fix dependencies and docker --- .DS_Store | Bin 8196 -> 0 bytes .gitignore | 2 ++ docker/api.Dockerfile | 1 + docker/control-plane.Dockerfile | 4 ++-- docker/docker-compose.yml | 2 +- memora-control-plane/src/lib/api.ts | 1 + memora/pyproject.toml | 4 +--- 7 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index aa9e06ba6d957d57031c2a3937384cacda72fee8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHM%WhLK5IrtYn-&xSs!%sb_Xmi?AEYH&L<&$f1&I~prIM0xqol3G24&Ab@C$q& zD>ySY$o5UP5fWp`p2+tc&-mEBSK|P1XSd_$zzKjltJsJ4*=#8CTxzB4g`Ow0j(nhv z4w{%_+?`d>)?o^m0;Yf|U<#N5|AGSiW=pAW`R@Ct)|vvQz<;TLydMfyv8`a&-s-D^ zjivy!HFj&^Z{`8YDS~YUyY^P89MfkHE>K-aF`TFKc_DDxRQ0Azq+|Q@n}u_i{9xl|w$219i&U{H2Azf5TZXOSBT+NVGu+P%S0_fs9MC@F_`?*xca`C5ioe1t#p#^BM|0Ze zy~TvJ#1exH`-5Y~*rOQBC`R-#O*yJX%xP@m(Bo&^whQ`Pk-Nm5wAl#xE_lEw7dq1c?UXk}*JN`B z8BbO^R;-S5uF^U0lrH|eJI2q@H{x2Cp zm-elW6mGcUSY+2FE7sslzp%;*U32auu5y#Lq?)sI-nwJsc^}eSho0JaNxQ{cwywhH zDXYJkPsBl`ruDxXsi(Le$4Az(eJ5}H}Lvubm diff --git a/.gitignore b/.gitignore index 23edfb8355..cf64b957a7 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ nltk_data/ # Debug logs logs/ + +.DS_Store diff --git a/docker/api.Dockerfile b/docker/api.Dockerfile index 807090912c..70edfece2b 100644 --- a/docker/api.Dockerfile +++ b/docker/api.Dockerfile @@ -11,6 +11,7 @@ WORKDIR /app # Copy only dependency files first for better caching COPY memora/pyproject.toml memora/README.md /app/memora/ COPY memora/memora /app/memora/memora +COPY memora/alembic /app/memora/alembic # Install uv for faster dependency installation RUN pip install --no-cache-dir uv diff --git a/docker/control-plane.Dockerfile b/docker/control-plane.Dockerfile index 55f035f439..55309122be 100644 --- a/docker/control-plane.Dockerfile +++ b/docker/control-plane.Dockerfile @@ -5,14 +5,14 @@ FROM base AS deps RUN apk add --no-cache libc6-compat WORKDIR /app -COPY memora-control-plane/package.json memora-control-plane/package-lock.json ./ +COPY package.json package-lock.json ./ RUN npm ci # Rebuild the source code only when needed FROM base AS builder WORKDIR /app COPY --from=deps /app/node_modules ./node_modules -COPY memora-control-plane/ . +COPY . . RUN npm run build diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 6897277f0b..e9617eb3dd 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -37,7 +37,7 @@ services: postgres: condition: service_healthy healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/api/v1/agents"] interval: 10s timeout: 5s retries: 5 diff --git a/memora-control-plane/src/lib/api.ts b/memora-control-plane/src/lib/api.ts index 2e831332cd..66814513bd 100644 --- a/memora-control-plane/src/lib/api.ts +++ b/memora-control-plane/src/lib/api.ts @@ -48,6 +48,7 @@ export class DataplaneClient { query: string; agent_id: string; thinking_budget?: number; + context?: string; }) { return this.fetchApi(`/api/think`, { method: 'POST', diff --git a/memora/pyproject.toml b/memora/pyproject.toml index eb3b12f708..94508215a6 100644 --- a/memora/pyproject.toml +++ b/memora/pyproject.toml @@ -27,6 +27,7 @@ dependencies = [ "torch>=2.0.0", "tiktoken>=0.12.0", "httpx>=0.27.0", + "fastmcp>=2.0.0", ] [project.optional-dependencies] @@ -35,9 +36,6 @@ test = [ "pytest-asyncio>=0.21.0", "pytest-timeout>=2.4.0", ] -mcp = [ - "fastmcp>=2.0.0", -] [tool.hatch.build.targets.wheel] packages = ["memora"]