Merge branch 'main' into cline

Author: yrobla

migrations/versions/2025_01_21_0820-4dec3e456c9e_add_on_delete_cascade.py

@@ -18,6 +18,12 @@
 
 
 def upgrade() -> None:
+    # Turn off foreign key constraints for this migration
+    op.execute("PRAGMA foreign_keys=off;")
+
+    # Begin transaction
+    op.execute("BEGIN TRANSACTION;")
+
     # To add ON DELETE CASCADE to the foreign key constraint, we need to
     # rename the table, create a new table with the constraint, and copy
     # the data over.
@@ -101,6 +107,13 @@ def upgrade() -> None:
     op.execute("CREATE INDEX idx_prompts_workspace_id ON prompts (workspace_id);")
     op.execute("CREATE INDEX idx_sessions_workspace_id ON sessions (active_workspace_id);")
 
+    # Finish transaction
+    op.execute("COMMIT;")
+
+    # Turn on foreign key constraints after the migration. Just to be sure. This shouldn't
+    # be necessary, since it should be specified at the beginning of every connection, doesn't hurt.
+    op.execute("PRAGMA foreign_keys=on;")
+
 
 def downgrade() -> None:
     # Settings table

migrations/versions/2025_01_22_0956-90d5471db49a_rename_system_prompt.py

@@ -0,0 +1,25 @@
+"""rename system_prompt
+
+Revision ID: 90d5471db49a
+Revises: 4dec3e456c9e
+Create Date: 2025-01-22 09:56:21.520839+00:00
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "90d5471db49a"
+down_revision: Union[str, None] = "4dec3e456c9e"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.execute("ALTER TABLE workspaces RENAME COLUMN system_prompt TO custom_instructions;")
+
+
+def downgrade() -> None:
+    op.execute("ALTER TABLE workspaces RENAME COLUMN custom_instructions TO system_prompt;")

poetry.lock

@@ -12,12 +12,12 @@ PyYAML = "==6.0.2"
 fastapi = "==0.115.6"
 uvicorn = "==0.34.0"
 structlog = "==25.1.0"
-litellm = "==1.59.0"
+litellm = "==1.59.1"
 llama_cpp_python = "==0.3.5"
 cryptography = "==44.0.0"
 sqlalchemy = "==2.0.37"
 aiosqlite = "==0.20.0"
-ollama = "==0.4.6"
+ollama = "==0.4.7"
 pydantic-settings = "==2.7.1"
 numpy = "==2.2.2"
 tree-sitter = "==0.24.0"
@@ -28,7 +28,7 @@ tree-sitter-python = "==0.23.6"
 tree-sitter-rust = "==0.23.2"
 alembic = "==1.14.1"
 pygments = "==2.19.1"
-sqlite-vec = "==0.1.6"
+sqlite-vec-sl-tmp = "==0.0.4"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "==8.3.4"
@@ -38,7 +38,7 @@ ruff = "==0.9.2"
 bandit = "==1.8.2"
 build = "==1.2.2.post1"
 wheel = "==0.45.1"
-litellm = "==1.59.0"
+litellm = "==1.59.1"
 pytest-asyncio = "==0.25.2"
 llama_cpp_python = "==0.3.5"
 scikit-learn = "==1.6.1"
@@ -62,7 +62,7 @@ line-length = 100
 target-version = "py310"
 fix = true
 exclude = [
-    "src/codegate/db/queries.py",   # Ignore auto-generated file from sqlc
+    "src/codegate/db/queries.py", # Ignore auto-generated file from sqlc
 ]
 
 [tool.ruff.lint]

pyproject.toml

@@ -5,7 +5,7 @@
 import sqlite3
 
 import numpy as np
-import sqlite_vec
+import sqlite_vec_sl_tmp
 
 from codegate.inference.inference_engine import LlamaCppInferenceEngine
 from codegate.utils.utils import generate_vector_string
@@ -27,7 +27,7 @@ def __init__(self, jsonl_dir="data", vec_db_path="./sqlite_data/vectordb.db"):
     def _get_connection(self):
         conn = sqlite3.connect(self.vec_db_path)
         conn.enable_load_extension(True)
-        sqlite_vec.load(conn)
+        sqlite_vec_sl_tmp.load(conn)
         conn.enable_load_extension(False)
         return conn
 

scripts/import_packages.py

@@ -228,35 +228,37 @@ async def get_workspace_messages(workspace_name: str) -> List[Conversation]:
 
 
 @v1.get(
-    "/workspaces/{workspace_name}/system-prompt",
+    "/workspaces/{workspace_name}/custom-instructions",
     tags=["Workspaces"],
     generate_unique_id_function=uniq_name,
 )
-async def get_workspace_system_prompt(workspace_name: str) -> v1_models.SystemPrompt:
-    """Get the system prompt for a workspace."""
+async def get_workspace_custom_instructions(workspace_name: str) -> v1_models.CustomInstructions:
+    """Get the custom instructions of a workspace."""
     try:
         ws = await wscrud.get_workspace_by_name(workspace_name)
     except crud.WorkspaceDoesNotExistError:
         raise HTTPException(status_code=404, detail="Workspace does not exist")
     except Exception:
         raise HTTPException(status_code=500, detail="Internal server error")
 
-    if ws.system_prompt is None:
-        return v1_models.SystemPrompt(prompt="")
+    if ws.custom_instructions is None:
+        return v1_models.CustomInstructions(prompt="")
 
-    return v1_models.SystemPrompt(prompt=ws.system_prompt)
+    return v1_models.CustomInstructions(prompt=ws.custom_instructions)
 
 
 @v1.put(
-    "/workspaces/{workspace_name}/system-prompt",
+    "/workspaces/{workspace_name}/custom-instructions",
     tags=["Workspaces"],
     generate_unique_id_function=uniq_name,
     status_code=204,
 )
-async def set_workspace_system_prompt(workspace_name: str, request: v1_models.SystemPrompt):
+async def set_workspace_custom_instructions(
+    workspace_name: str, request: v1_models.CustomInstructions
+):
     try:
         # This already checks if the workspace exists
-        await wscrud.update_workspace_system_prompt(workspace_name, [request.prompt])
+        await wscrud.update_workspace_custom_instructions(workspace_name, [request.prompt])
     except crud.WorkspaceDoesNotExistError:
         raise HTTPException(status_code=404, detail="Workspace does not exist")
     except Exception:
@@ -266,15 +268,15 @@ async def set_workspace_system_prompt(workspace_name: str, request: v1_models.Sy
 
 
 @v1.delete(
-    "/workspaces/{workspace_name}/system-prompt",
+    "/workspaces/{workspace_name}/custom-instructions",
     tags=["Workspaces"],
     generate_unique_id_function=uniq_name,
     status_code=204,
 )
-async def delete_workspace_system_prompt(workspace_name: str):
+async def delete_workspace_custom_instructions(workspace_name: str):
     try:
         # This already checks if the workspace exists
-        await wscrud.update_workspace_system_prompt(workspace_name, [])
+        await wscrud.update_workspace_custom_instructions(workspace_name, [])
     except crud.WorkspaceDoesNotExistError:
         raise HTTPException(status_code=404, detail="Workspace does not exist")
     except Exception:

src/codegate/api/v1.py

@@ -10,7 +10,7 @@ class Workspace(pydantic.BaseModel):
     is_active: bool
 
 
-class SystemPrompt(pydantic.BaseModel):
+class CustomInstructions(pydantic.BaseModel):
     prompt: str
 
 

src/codegate/api/v1_models.py

@@ -271,7 +271,7 @@ async def add_workspace(self, workspace_name: str) -> Workspace:
         It may raise a ValidationError if the workspace name is invalid.
         or a AlreadyExistsError if the workspace already exists.
         """
-        workspace = Workspace(id=str(uuid.uuid4()), name=workspace_name, system_prompt=None)
+        workspace = Workspace(id=str(uuid.uuid4()), name=workspace_name, custom_instructions=None)
         sql = text(
             """
             INSERT INTO workspaces (id, name)
@@ -294,7 +294,7 @@ async def update_workspace(self, workspace: Workspace) -> Workspace:
             """
             UPDATE workspaces SET
             name = :name,
-            system_prompt = :system_prompt
+            custom_instructions = :custom_instructions
             WHERE id = :id
             RETURNING *
             """
@@ -477,7 +477,7 @@ async def get_archived_workspaces(self) -> List[Workspace]:
         sql = text(
             """
             SELECT
-                id, name, system_prompt
+                id, name, custom_instructions
             FROM workspaces
             WHERE deleted_at IS NOT NULL
             ORDER BY deleted_at DESC
@@ -490,7 +490,7 @@ async def get_workspace_by_name(self, name: str) -> Optional[Workspace]:
         sql = text(
             """
             SELECT
-                id, name, system_prompt
+                id, name, custom_instructions
             FROM workspaces
             WHERE name = :name AND deleted_at IS NULL
             """
@@ -505,7 +505,7 @@ async def get_archived_workspace_by_name(self, name: str) -> Optional[Workspace]
         sql = text(
             """
             SELECT
-                id, name, system_prompt
+                id, name, custom_instructions
             FROM workspaces
             WHERE name = :name AND deleted_at IS NOT NULL
             """
@@ -531,7 +531,7 @@ async def get_active_workspace(self) -> Optional[ActiveWorkspace]:
         sql = text(
             """
             SELECT
-                w.id, w.name, w.system_prompt, s.id as session_id, s.last_update
+                w.id, w.name, w.custom_instructions, s.id as session_id, s.last_update
             FROM sessions s
             INNER JOIN workspaces w ON w.id = s.active_workspace_id
             """