Merge branch 'main' of github.com:stacklok/codegate into feat/555/version-endpoint

Author: alex-mcgovern

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -45,7 +45,7 @@ body:
     attributes:
       label: "IDE and Version"
       description: "Enter the IDE name and version."
-      placeholder: "e.g., VS Code 1.78.0"
+      placeholder: "e.g. VS Code 1.78.0"
     validations:
       required: true
 
@@ -54,7 +54,7 @@ body:
     attributes:
       label: "Extension and Version"
       description: "Enter the extension name and version."
-      placeholder: "e.g., Proxy Extension 0.5.1"
+      placeholder: "e.g. Proxy Extension 0.5.1"
     validations:
       required: true
 
@@ -77,8 +77,17 @@ body:
     id: model
     attributes:
       label: "Model"
-      description: "Enter the model name used (e.g., GPT-4, Claude 3)."
-      placeholder: "e.g., GPT-4"
+      description: "Enter the model name used (e.g. GPT-4, Claude 3)."
+      placeholder: "e.g. GPT-4"
+    validations:
+      required: true
+
+  - type: input
+    id: codegate-version
+    attributes:
+      label: "Codegate version"
+      description: "Enter the version of CodeGate (e.g. `v0.1.8`, `4845e00c039e`)."
+      placeholder: "e.g. v0.1.8"
     validations:
       required: true
 

migrations/versions/5c2f3eee5f90_introduce_workspaces.py

@@ -0,0 +1,61 @@
+"""introduce workspaces
+
+Revision ID: 5c2f3eee5f90
+Revises: 30d0144e1a50
+Create Date: 2025-01-15 19:27:08.230296
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "5c2f3eee5f90"
+down_revision: Union[str, None] = "30d0144e1a50"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # Workspaces table
+    op.execute(
+        """
+        CREATE TABLE workspaces (
+            id TEXT PRIMARY KEY,  -- UUID stored as TEXT
+            name TEXT NOT NULL,
+            UNIQUE (name)
+        );
+        """
+    )
+    op.execute("INSERT INTO workspaces (id, name) VALUES ('1', 'default');")
+    # Sessions table
+    op.execute(
+        """
+        CREATE TABLE sessions (
+            id TEXT PRIMARY KEY,  -- UUID stored as TEXT
+            active_workspace_id TEXT NOT NULL,
+            last_update DATETIME NOT NULL,
+            FOREIGN KEY (active_workspace_id) REFERENCES workspaces(id)
+        );
+        """
+    )
+    # Alter table prompts
+    op.execute("ALTER TABLE prompts ADD COLUMN workspace_id TEXT REFERENCES workspaces(id);")
+    op.execute("UPDATE prompts SET workspace_id = '1';")
+    # Create index for workspace_id
+    op.execute("CREATE INDEX idx_prompts_workspace_id ON prompts (workspace_id);")
+    # Create index for session_id
+    op.execute("CREATE INDEX idx_sessions_workspace_id ON sessions (active_workspace_id);")
+
+
+def downgrade() -> None:
+    # Drop the index for workspace_id
+    op.execute("DROP INDEX IF EXISTS idx_prompts_workspace_id;")
+    op.execute("DROP INDEX IF EXISTS idx_sessions_workspace_id;")
+    # Remove the workspace_id column from prompts table
+    op.execute("ALTER TABLE prompts DROP COLUMN workspace_id;")
+    # Drop the sessions table
+    op.execute("DROP TABLE IF EXISTS sessions;")
+    # Drop the workspaces table
+    op.execute("DROP TABLE IF EXISTS workspaces;")

poetry.lock

@@ -11,7 +11,7 @@ click = "==8.1.8"
 PyYAML = "==6.0.2"
 fastapi = "==0.115.6"
 uvicorn = "==0.34.0"
-structlog = "==24.4.0"
+structlog = "==25.1.0"
 litellm = "==1.58.0"
 llama_cpp_python = "==0.3.5"
 cryptography = "==44.0.0"
@@ -20,7 +20,7 @@ aiosqlite = "==0.20.0"
 ollama = "==0.4.6"
 pydantic-settings = "==2.7.1"
 numpy = "==2.2.1"
-tree-sitter = "==0.23.2"
+tree-sitter = "==0.24.0"
 tree-sitter-go = "==0.23.4"
 tree-sitter-java = "==0.23.5"
 tree-sitter-javascript = "==0.23.1"
@@ -34,7 +34,7 @@ pygments = "==2.19.1"
 pytest = "==8.3.4"
 pytest-cov = "==6.0.0"
 black = "==24.10.0"
-ruff = "==0.9.1"
+ruff = "==0.9.2"
 bandit = "==1.8.2"
 build = "==1.2.2.post1"
 wheel = "==0.45.1"

pyproject.toml

@@ -10,6 +10,7 @@
 _VERSION = "dev"
 _DESC = "CodeGate - A Generative AI security gateway."
 
+
 def __get_version_and_description() -> tuple[str, str]:
     try:
         version = metadata.version("codegate")
@@ -19,6 +20,7 @@ def __get_version_and_description() -> tuple[str, str]:
         description = _DESC
     return version, description
 
+
 __version__, __description__ = __get_version_and_description()
 
 __all__ = ["Config", "ConfigurationError", "LogFormat", "LogLevel", "setup_logging"]

src/codegate/__init__.py

@@ -14,7 +14,7 @@
 from codegate.ca.codegate_ca import CertificateAuthority
 from codegate.codegate_logging import LogFormat, LogLevel, setup_logging
 from codegate.config import Config, ConfigurationError
-from codegate.db.connection import init_db_sync
+from codegate.db.connection import init_db_sync, init_session_if_not_exists
 from codegate.pipeline.factory import PipelineFactory
 from codegate.pipeline.secrets.manager import SecretsManager
 from codegate.providers.copilot.provider import CopilotProvider
@@ -307,6 +307,7 @@ def serve(
         logger = structlog.get_logger("codegate").bind(origin="cli")
 
         init_db_sync(cfg.db_path)
+        init_session_if_not_exists(cfg.db_path)
 
         # Check certificates and create CA if necessary
         logger.info("Checking certificates and creating CA if needed")