feat(docker-compose): namespace corpora services

.corpora.yaml

@@ -1,4 +1,4 @@
 name: skyl/corpora
 server:
-  base_url: http://app:8877
+  base_url: http://corpora-app:8877
 url: https://github.com/skyl/corpora

.devcontainer/README.md

@@ -78,7 +78,6 @@ corpora plan issue
 
 ## Ports
 - **App:** 8877
-- **Database:** 5432
 
 ## Notes
 - Variations in Docker setup can be found in `../docker-compose.yaml` and `../docker/README.md`.

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 {
     "name": "Corpora DevContainer",
     "dockerComposeFile": "../docker-compose.yaml",
-    "service": "interactive",
+    "service": "corpora-interactive",
     "workspaceFolder": "/workspace",
     "customizations": {
         "vscode": {
@@ -47,8 +47,7 @@
     ],
     "postCreateCommand": "/workspace/.devcontainer/setup.sh",
     "forwardPorts": [
-        8877,
-        5432
+        8877
     ],
     "remoteUser": "vscode"
 }

docker-compose.yaml

@@ -1,24 +1,26 @@
 services:
-  app:
+  corpora-app:
     build:
       context: .
       dockerfile: docker/Dockerfile.app
     volumes:
       - .:/workspace
     environment:
       PYTHONPATH: "/workspace/py/packages"
-      REDIS_URL: "redis://redis:6379/0"
+      REDIS_URL: "redis://corpora-redis:6379/0"
       OPENAI_API_KEY: "${OPENAI_API_KEY}"
     command: python manage.py runserver 0.0.0.0:8877
     working_dir: /workspace/py/packages/corpora_proj
     depends_on:
-      - db
-      - redis
-      - celery
+      - corpora-db
+      - corpora-redis
+      - corpora-celery
     ports:
       - "8877:8877"
+    networks:
+      - shared-network
 
-  celery:
+  corpora-celery:
     build:
       context: .
       dockerfile: docker/Dockerfile.app
@@ -27,13 +29,15 @@ services:
       - .:/workspace
     environment:
       PYTHONPATH: "/workspace/py/packages"
-      REDIS_URL: "redis://redis:6379/0"
+      REDIS_URL: "redis://corpora-redis:6379/0"
       OPENAI_API_KEY: "${OPENAI_API_KEY}"
     depends_on:
-      redis:
+      corpora-redis:
         condition: service_healthy
+    networks:
+      - shared-network
 
-  db:
+  corpora-db:
     build:
       context: .
       dockerfile: docker/Dockerfile.pgvector
@@ -45,8 +49,10 @@ services:
       - "5432:5432"
     volumes:
       - postgres-data:/var/lib/postgresql/data
+    networks:
+      - shared-network
 
-  redis:
+  corpora-redis:
     image: redis:latest
     ports:
       - "6379:6379"
@@ -55,8 +61,10 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
+    networks:
+      - shared-network
 
-  interactive:
+  corpora-interactive:
     build:
       context: .
       dockerfile: docker/Dockerfile
@@ -69,6 +77,13 @@ services:
       GITHUB_TOKEN: "${GITHUB_TOKEN}"
     command: sleep infinity
     working_dir: /workspace
+    networks:
+      - shared-network
 
 volumes:
   postgres-data:
+
+
+networks:
+  shared-network:
+    name: shared-network

py/genall.sh

@@ -4,7 +4,7 @@ set -e
 rm -rf packages/corpora_client
 mkdir -p packages/corpora_client/docs packages/corpora_client/test
 rm -rf gen/corpora_client
-openapi-generator-cli generate -i http://app:8877/api/openapi.json \
+openapi-generator-cli generate -i http://corpora-app:8877/api/openapi.json \
     -g python -o gen/corpora_client \
     --additional-properties=packageName=corpora_client
     # --additional-properties=library=asyncio

py/openapitools.json

@@ -4,4 +4,4 @@
   "generator-cli": {
     "version": "7.10.0"
   }
-}
+}

py/packages/corpora/views.py

@@ -6,7 +6,7 @@
 
 class BinaryView(View):
     def get(self, request, arch, *args, **kwargs):
-        path = f"/workspace/rs/target/{arch}/release/corpora_cli"
+        path = f"/workspace/rs/target/{arch}/release/corpora"
         if not os.path.exists(path):
             return HttpResponse("Binary not found", status=404)
 

py/packages/corpora_cli/auth.py

@@ -14,7 +14,7 @@ class AuthError(Exception):
 class AuthResolver:
     def __init__(self, config: Dict[str, Any]):
         self.config = config
-        base_url = config.get("base_url", "http://app:8877")
+        base_url = config.get("base_url", "http://corpora-app:8877")
         self.token_url = f"{base_url}/o/token/"
 
     def resolve_auth(self) -> str:

py/packages/corpora_cli/main.py

@@ -41,7 +41,9 @@ def get_api_clients(
     # Configure and return the authenticated API client
     client_config = corpora_client.Configuration()
     # TODO: deploy and default to the main production server?
-    client_config.host = config.get("server", {}).get("base_url", "http://app:8877")
+    client_config.host = config.get("server", {}).get(
+        "base_url", "http://corpora-app:8877"
+    )
     client_config.access_token = auth_token
     return (
         corpora_client.CorpusApi(corpora_client.ApiClient(client_config)),

py/packages/corpora_cli/test_config.py

@@ -12,7 +12,7 @@ def yaml_content():
     """Sample YAML content for testing."""
     return """
     server:
-      base_url: "http://app:8877"
+      base_url: "http://corpora-app:8877"
     auth:
       client_id: "${CORPORA_CLIENT_ID}"
       client_secret: "${CORPORA_CLIENT_SECRET}"
@@ -44,7 +44,7 @@ def test_load_config_success(mock_yaml_load, mock_file_open, yaml_content, mocke
     """Test load_config with successful loading and env substitution."""
     # Set up mock for yaml.safe_load to return the parsed YAML structure
     mock_yaml_load.return_value = {
-        "server": {"base_url": "http://app:8877"},
+        "server": {"base_url": "http://corpora-app:8877"},
         "auth": {
             "client_id": "${CORPORA_CLIENT_ID}",
             "client_secret": "${CORPORA_CLIENT_SECRET}",
@@ -60,7 +60,7 @@ def test_load_config_success(mock_yaml_load, mock_file_open, yaml_content, mocke
     assert config["auth"]["client_id"] == "test_client_id"
     assert config["auth"]["client_secret"] == "test_client_secret"
     assert config["auth"]["optional_auth"] == "optional_auth_value"
-    assert config["server"]["base_url"] == "http://app:8877"
+    assert config["server"]["base_url"] == "http://corpora-app:8877"
 
 
 @patch("builtins.open", new_callable=mock_open)
@@ -104,7 +104,7 @@ def test_substitute_env_variables(mocked_env):
             "client_secret": "${CORPORA_CLIENT_SECRET}",
             "nonexistent_var": "${NON_EXISTENT_VAR}",
         },
-        "server": {"base_url": "http://app:8877"},
+        "server": {"base_url": "http://corpora-app:8877"},
     }
     substituted_config = substitute_env_variables(config)
 
@@ -113,4 +113,4 @@ def test_substitute_env_variables(mocked_env):
     assert (
         substituted_config["auth"]["nonexistent_var"] == ""
     )  # Non-existent vars default to ""
-    assert substituted_config["server"]["base_url"] == "http://app:8877"
+    assert substituted_config["server"]["base_url"] == "http://corpora-app:8877"