From 0e8258e1aa322ef3f2654172afa769267a4f4f3c Mon Sep 17 00:00:00 2001
From: Kumaran Rajendhiran <kumaran@airt.ai>
Date: Mon, 22 Jul 2024 05:46:43 +0000
Subject: [PATCH 1/2] Add studio suffix to devcontainer names

---
 .devcontainer/python-3.10/devcontainer.json  |  2 +-
 .devcontainer/python-3.10/docker-compose.yml | 22 ++++++++++----------
 .devcontainer/python-3.11/devcontainer.json  |  2 +-
 .devcontainer/python-3.11/docker-compose.yml | 22 ++++++++++----------
 .devcontainer/python-3.12/devcontainer.json  |  2 +-
 .devcontainer/python-3.12/docker-compose.yml | 22 ++++++++++----------
 .devcontainer/python-3.9/devcontainer.json   |  2 +-
 .devcontainer/python-3.9/docker-compose.yml  | 22 ++++++++++----------
 8 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/.devcontainer/python-3.10/devcontainer.json b/.devcontainer/python-3.10/devcontainer.json
index 6f4d99b2..1090d3d7 100644
--- a/.devcontainer/python-3.10/devcontainer.json
+++ b/.devcontainer/python-3.10/devcontainer.json
@@ -6,7 +6,7 @@
     ],
     "service": "python-3.10",
     "forwardPorts": [
-        "${containerEnv:CONTAINER_PREFIX}-nats-py310-fastagency:9222"
+        "${containerEnv:CONTAINER_PREFIX}-nats-py310-fastagency-studio:9222"
     ],
     "shutdownAction": "stopCompose",
     "workspaceFolder": "/workspaces/fastagency",
diff --git a/.devcontainer/python-3.10/docker-compose.yml b/.devcontainer/python-3.10/docker-compose.yml
index f0344f40..da42f7f9 100644
--- a/.devcontainer/python-3.10/docker-compose.yml
+++ b/.devcontainer/python-3.10/docker-compose.yml
@@ -3,21 +3,21 @@ version: '3'
 services:
   python-3.10:  # nosemgrep
     image: mcr.microsoft.com/devcontainers/python:3.10
-    container_name: $USER-python-3.10-fastagency
+    container_name: $USER-python-3.10-fastagency-studio
     volumes:
       - ../../:/workspaces/fastagency:cached
     command: sleep infinity
     environment:
-      - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py310-fastagency:5432/fastagency
-      - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py310-fastagency:5432/pyfastagency
-      - NATS_URL=nats://${USER}-nats-py310-fastagency:4222
+      - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py310-fastagency-studio:5432/fastagency
+      - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py310-fastagency-studio:5432/pyfastagency
+      - NATS_URL=nats://${USER}-nats-py310-fastagency-studio:4222
     env_file:
       - ../devcontainer.env
     networks:
-      - fastagency-network
+      - fastagency-studio-network
   nats-fastagency:  # nosemgrep
     image: nats:latest
-    container_name: $USER-nats-py310-fastagency
+    container_name: $USER-nats-py310-fastagency-studio
     # ports:
       # - "${PORT_PREFIX}4222:4222"
       # - "${PORT_PREFIX}9222:9222"
@@ -27,10 +27,10 @@ services:
     env_file:
       - ../devcontainer.env
     networks:
-      - fastagency-network
+      - fastagency-studio-network
   postgres-fastagency:  # nosemgrep
     image: postgres:latest
-    container_name: $USER-postgres-py310-fastagency
+    container_name: $USER-postgres-py310-fastagency-studio
     environment:
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: password  # pragma: allowlist secret
@@ -38,8 +38,8 @@ services:
     # ports:
     #   - "${PORT_PREFIX}5432:5432"
     networks:
-      - fastagency-network
+      - fastagency-studio-network
 
 networks:
-  fastagency-network:
-    name: "${USER}-fastagency-network"
+  fastagency-studio-network:
+    name: "${USER}-fastagency-studio-network"
diff --git a/.devcontainer/python-3.11/devcontainer.json b/.devcontainer/python-3.11/devcontainer.json
index a6b4ee91..3758ddc8 100644
--- a/.devcontainer/python-3.11/devcontainer.json
+++ b/.devcontainer/python-3.11/devcontainer.json
@@ -5,7 +5,7 @@
     ],
     "service": "python-3.11",
     "forwardPorts": [
-        "${containerEnv:CONTAINER_PREFIX}-nats-py311-fastagency:9222"
+        "${containerEnv:CONTAINER_PREFIX}-nats-py311-fastagency-studio:9222"
     ],
     "shutdownAction": "stopCompose",
     "workspaceFolder": "/workspaces/fastagency",
diff --git a/.devcontainer/python-3.11/docker-compose.yml b/.devcontainer/python-3.11/docker-compose.yml
index 3d33d672..3a8b790c 100644
--- a/.devcontainer/python-3.11/docker-compose.yml
+++ b/.devcontainer/python-3.11/docker-compose.yml
@@ -3,21 +3,21 @@ version: '3'
 services:
   python-3.11:  # nosemgrep
     image: mcr.microsoft.com/devcontainers/python:3.11
-    container_name: $USER-python-3.11-fastagency
+    container_name: $USER-python-3.11-fastagency-studio
     volumes:
       - ../../:/workspaces/fastagency:cached
     command: sleep infinity
     environment:
-      - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py311-fastagency:5432/fastagency
-      - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py311-fastagency:5432/pyfastagency
-      - NATS_URL=nats://${USER}-nats-py311-fastagency:4222
+      - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py311-fastagency-studio:5432/fastagency
+      - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py311-fastagency-studio:5432/pyfastagency
+      - NATS_URL=nats://${USER}-nats-py311-fastagency-studio:4222
     env_file:
       - ../devcontainer.env
     networks:
-      - fastagency-network
+      - fastagency-studio-network
   nats-fastagency:  # nosemgrep
     image: nats:latest
-    container_name: $USER-nats-py311-fastagency
+    container_name: $USER-nats-py311-fastagency-studio
     # ports:
       # - "${PORT_PREFIX}4222:4222"
       # - "${PORT_PREFIX}9222:9222"
@@ -27,10 +27,10 @@ services:
     env_file:
       - ../devcontainer.env
     networks:
-      - fastagency-network
+      - fastagency-studio-network
   postgres-fastagency:  # nosemgrep
     image: postgres:latest
-    container_name: $USER-postgres-py311-fastagency
+    container_name: $USER-postgres-py311-fastagency-studio
     environment:
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: password  # pragma: allowlist secret
@@ -38,8 +38,8 @@ services:
     # ports:
     #   - "${PORT_PREFIX}5432:5432"
     networks:
-      - fastagency-network
+      - fastagency-studio-network
 
 networks:
-  fastagency-network:
-    name: "${USER}-fastagency-network"
+  fastagency-studio-network:
+    name: "${USER}-fastagency-studio-network"
diff --git a/.devcontainer/python-3.12/devcontainer.json b/.devcontainer/python-3.12/devcontainer.json
index 0f4866c7..60c988da 100644
--- a/.devcontainer/python-3.12/devcontainer.json
+++ b/.devcontainer/python-3.12/devcontainer.json
@@ -6,7 +6,7 @@
     ],
     "service": "python-3.12",
     "forwardPorts": [
-        "${containerEnv:CONTAINER_PREFIX}-nats-py312-fastagency:9222"
+        "${containerEnv:CONTAINER_PREFIX}-nats-py312-fastagency-studio:9222"
     ],
     "shutdownAction": "stopCompose",
     "workspaceFolder": "/workspaces/fastagency",
diff --git a/.devcontainer/python-3.12/docker-compose.yml b/.devcontainer/python-3.12/docker-compose.yml
index e2bc5810..635a463e 100644
--- a/.devcontainer/python-3.12/docker-compose.yml
+++ b/.devcontainer/python-3.12/docker-compose.yml
@@ -3,21 +3,21 @@ version: '3'
 services:
   python-3.12:  # nosemgrep
     image: mcr.microsoft.com/devcontainers/python:3.12
-    container_name: $USER-python-3.12-fastagency
+    container_name: $USER-python-3.12-fastagency-studio
     volumes:
       - ../../:/workspaces/fastagency:cached
     command: sleep infinity
     environment:
-      - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py312-fastagency:5432/fastagency
-      - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py312-fastagency:5432/pyfastagency
-      - NATS_URL=nats://${USER}-nats-py312-fastagency:4222
+      - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py312-fastagency-studio:5432/fastagency
+      - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py312-fastagency-studio:5432/pyfastagency
+      - NATS_URL=nats://${USER}-nats-py312-fastagency-studio:4222
     env_file:
       - ../devcontainer.env
     networks:
-      - fastagency-network
+      - fastagency-studio-network
   nats-fastagency:  # nosemgrep
     image: nats:latest
-    container_name: $USER-nats-py312-fastagency
+    container_name: $USER-nats-py312-fastagency-studio
     # ports:
       # - "${PORT_PREFIX}4222:4222"
       # - "${PORT_PREFIX}9222:9222"
@@ -27,10 +27,10 @@ services:
     env_file:
       - ../devcontainer.env
     networks:
-      - fastagency-network
+      - fastagency-studio-network
   postgres-fastagency:  # nosemgrep
     image: postgres:latest
-    container_name: $USER-postgres-py312-fastagency
+    container_name: $USER-postgres-py312-fastagency-studio
     environment:
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: password  # pragma: allowlist secret
@@ -38,8 +38,8 @@ services:
     # ports:
     #   - "${PORT_PREFIX}5432:5432"
     networks:
-      - fastagency-network
+      - fastagency-studio-network
 
 networks:
-  fastagency-network:
-    name: "${USER}-fastagency-network"
+  fastagency-studio-network:
+    name: "${USER}-fastagency-studio-network"
diff --git a/.devcontainer/python-3.9/devcontainer.json b/.devcontainer/python-3.9/devcontainer.json
index 00e49afb..ee4c2c46 100644
--- a/.devcontainer/python-3.9/devcontainer.json
+++ b/.devcontainer/python-3.9/devcontainer.json
@@ -6,7 +6,7 @@
     ],
     "service": "python-3.9",
     "forwardPorts": [
-        "${containerEnv:CONTAINER_PREFIX}-nats-py39-fastagency:9222"
+        "${containerEnv:CONTAINER_PREFIX}-nats-py39-fastagency-studio:9222"
     ],
     "shutdownAction": "stopCompose",
     "workspaceFolder": "/workspaces/fastagency",
diff --git a/.devcontainer/python-3.9/docker-compose.yml b/.devcontainer/python-3.9/docker-compose.yml
index e8b0c627..57929835 100644
--- a/.devcontainer/python-3.9/docker-compose.yml
+++ b/.devcontainer/python-3.9/docker-compose.yml
@@ -3,21 +3,21 @@ version: '3'
 services:
   python-3.9:  # nosemgrep
     image: mcr.microsoft.com/devcontainers/python:3.9
-    container_name: $USER-python-3.9-fastagency
+    container_name: $USER-python-3.9-fastagency-studio
     volumes:
       - ../../:/workspaces/fastagency:cached
     command: sleep infinity
     environment:
-      - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py39-fastagency:5432/fastagency
-      - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py39-fastagency:5432/pyfastagency
-      - NATS_URL=nats://${USER}-nats-py39-fastagency:4222
+      - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py39-fastagency-studio:5432/fastagency
+      - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py39-fastagency-studio:5432/pyfastagency
+      - NATS_URL=nats://${USER}-nats-py39-fastagency-studio:4222
     env_file:
       - ../devcontainer.env
     networks:
-      - fastagency-network
+      - fastagency-studio-network
   nats-fastagency:  # nosemgrep
     image: nats:latest
-    container_name: $USER-nats-py39-fastagency
+    container_name: $USER-nats-py39-fastagency-studio
     # ports:
       # - "${PORT_PREFIX}4222:4222"
       # - "${PORT_PREFIX}9222:9222"
@@ -27,10 +27,10 @@ services:
     env_file:
       - ../devcontainer.env
     networks:
-      - fastagency-network
+      - fastagency-studio-network
   postgres-fastagency:  # nosemgrep
     image: postgres:latest
-    container_name: $USER-postgres-py39-fastagency
+    container_name: $USER-postgres-py39-fastagency-studio
     environment:
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: password  # pragma: allowlist secret
@@ -38,8 +38,8 @@ services:
     # ports:
     #   - "${PORT_PREFIX}5432:5432"
     networks:
-      - fastagency-network
+      - fastagency-studio-network
 
 networks:
-  fastagency-network:
-    name: "${USER}-fastagency-network"
+  fastagency-studio-network:
+    name: "${USER}-fastagency-studio-network"

From 4c16c4b734d2de8ae98ef4a26f9d4b4f6cfaff01 Mon Sep 17 00:00:00 2001
From: Kumaran Rajendhiran <kumaran@airt.ai>
Date: Mon, 22 Jul 2024 07:24:36 +0000
Subject: [PATCH 2/2] Update devcontainer service name

---
 .devcontainer/python-3.10/devcontainer.json  | 2 +-
 .devcontainer/python-3.10/docker-compose.yml | 6 +++---
 .devcontainer/python-3.11/devcontainer.json  | 2 +-
 .devcontainer/python-3.11/docker-compose.yml | 6 +++---
 .devcontainer/python-3.12/devcontainer.json  | 2 +-
 .devcontainer/python-3.12/docker-compose.yml | 6 +++---
 .devcontainer/python-3.9/devcontainer.json   | 2 +-
 .devcontainer/python-3.9/docker-compose.yml  | 6 +++---
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.devcontainer/python-3.10/devcontainer.json b/.devcontainer/python-3.10/devcontainer.json
index 1090d3d7..e0c9fb9a 100644
--- a/.devcontainer/python-3.10/devcontainer.json
+++ b/.devcontainer/python-3.10/devcontainer.json
@@ -4,7 +4,7 @@
     "dockerComposeFile": [
         "./docker-compose.yml"
     ],
-    "service": "python-3.10",
+    "service": "python-3.10-fastagency-studio",
     "forwardPorts": [
         "${containerEnv:CONTAINER_PREFIX}-nats-py310-fastagency-studio:9222"
     ],
diff --git a/.devcontainer/python-3.10/docker-compose.yml b/.devcontainer/python-3.10/docker-compose.yml
index da42f7f9..0496273c 100644
--- a/.devcontainer/python-3.10/docker-compose.yml
+++ b/.devcontainer/python-3.10/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 
 services:
-  python-3.10:  # nosemgrep
+  python-3.10-fastagency-studio:  # nosemgrep
     image: mcr.microsoft.com/devcontainers/python:3.10
     container_name: $USER-python-3.10-fastagency-studio
     volumes:
@@ -15,7 +15,7 @@ services:
       - ../devcontainer.env
     networks:
       - fastagency-studio-network
-  nats-fastagency:  # nosemgrep
+  nats-fastagency-studio:  # nosemgrep
     image: nats:latest
     container_name: $USER-nats-py310-fastagency-studio
     # ports:
@@ -28,7 +28,7 @@ services:
       - ../devcontainer.env
     networks:
       - fastagency-studio-network
-  postgres-fastagency:  # nosemgrep
+  postgres-fastagency-studio:  # nosemgrep
     image: postgres:latest
     container_name: $USER-postgres-py310-fastagency-studio
     environment:
diff --git a/.devcontainer/python-3.11/devcontainer.json b/.devcontainer/python-3.11/devcontainer.json
index 3758ddc8..de85a654 100644
--- a/.devcontainer/python-3.11/devcontainer.json
+++ b/.devcontainer/python-3.11/devcontainer.json
@@ -3,7 +3,7 @@
     "dockerComposeFile": [
         "./docker-compose.yml"
     ],
-    "service": "python-3.11",
+    "service": "python-3.11-fastagency-studio",
     "forwardPorts": [
         "${containerEnv:CONTAINER_PREFIX}-nats-py311-fastagency-studio:9222"
     ],
diff --git a/.devcontainer/python-3.11/docker-compose.yml b/.devcontainer/python-3.11/docker-compose.yml
index 3a8b790c..39933e1e 100644
--- a/.devcontainer/python-3.11/docker-compose.yml
+++ b/.devcontainer/python-3.11/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 
 services:
-  python-3.11:  # nosemgrep
+  python-3.11-fastagency-studio:  # nosemgrep
     image: mcr.microsoft.com/devcontainers/python:3.11
     container_name: $USER-python-3.11-fastagency-studio
     volumes:
@@ -15,7 +15,7 @@ services:
       - ../devcontainer.env
     networks:
       - fastagency-studio-network
-  nats-fastagency:  # nosemgrep
+  nats-fastagency-studio:  # nosemgrep
     image: nats:latest
     container_name: $USER-nats-py311-fastagency-studio
     # ports:
@@ -28,7 +28,7 @@ services:
       - ../devcontainer.env
     networks:
       - fastagency-studio-network
-  postgres-fastagency:  # nosemgrep
+  postgres-fastagency-studio:  # nosemgrep
     image: postgres:latest
     container_name: $USER-postgres-py311-fastagency-studio
     environment:
diff --git a/.devcontainer/python-3.12/devcontainer.json b/.devcontainer/python-3.12/devcontainer.json
index 60c988da..8cc1b693 100644
--- a/.devcontainer/python-3.12/devcontainer.json
+++ b/.devcontainer/python-3.12/devcontainer.json
@@ -4,7 +4,7 @@
     "dockerComposeFile": [
         "./docker-compose.yml"
     ],
-    "service": "python-3.12",
+    "service": "python-3.12-fastagency-studio",
     "forwardPorts": [
         "${containerEnv:CONTAINER_PREFIX}-nats-py312-fastagency-studio:9222"
     ],
diff --git a/.devcontainer/python-3.12/docker-compose.yml b/.devcontainer/python-3.12/docker-compose.yml
index 635a463e..64dd1c49 100644
--- a/.devcontainer/python-3.12/docker-compose.yml
+++ b/.devcontainer/python-3.12/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 
 services:
-  python-3.12:  # nosemgrep
+  python-3.12-fastagency-studio:  # nosemgrep
     image: mcr.microsoft.com/devcontainers/python:3.12
     container_name: $USER-python-3.12-fastagency-studio
     volumes:
@@ -15,7 +15,7 @@ services:
       - ../devcontainer.env
     networks:
       - fastagency-studio-network
-  nats-fastagency:  # nosemgrep
+  nats-fastagency-studio:  # nosemgrep
     image: nats:latest
     container_name: $USER-nats-py312-fastagency-studio
     # ports:
@@ -28,7 +28,7 @@ services:
       - ../devcontainer.env
     networks:
       - fastagency-studio-network
-  postgres-fastagency:  # nosemgrep
+  postgres-fastagency-studio:  # nosemgrep
     image: postgres:latest
     container_name: $USER-postgres-py312-fastagency-studio
     environment:
diff --git a/.devcontainer/python-3.9/devcontainer.json b/.devcontainer/python-3.9/devcontainer.json
index ee4c2c46..fee7832d 100644
--- a/.devcontainer/python-3.9/devcontainer.json
+++ b/.devcontainer/python-3.9/devcontainer.json
@@ -4,7 +4,7 @@
     "dockerComposeFile": [
         "./docker-compose.yml"
     ],
-    "service": "python-3.9",
+    "service": "python-3.9-fastagency-studio",
     "forwardPorts": [
         "${containerEnv:CONTAINER_PREFIX}-nats-py39-fastagency-studio:9222"
     ],
diff --git a/.devcontainer/python-3.9/docker-compose.yml b/.devcontainer/python-3.9/docker-compose.yml
index 57929835..6906949b 100644
--- a/.devcontainer/python-3.9/docker-compose.yml
+++ b/.devcontainer/python-3.9/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 
 services:
-  python-3.9:  # nosemgrep
+  python-3.9-fastagency-studio:  # nosemgrep
     image: mcr.microsoft.com/devcontainers/python:3.9
     container_name: $USER-python-3.9-fastagency-studio
     volumes:
@@ -15,7 +15,7 @@ services:
       - ../devcontainer.env
     networks:
       - fastagency-studio-network
-  nats-fastagency:  # nosemgrep
+  nats-fastagency-studio:  # nosemgrep
     image: nats:latest
     container_name: $USER-nats-py39-fastagency-studio
     # ports:
@@ -28,7 +28,7 @@ services:
       - ../devcontainer.env
     networks:
       - fastagency-studio-network
-  postgres-fastagency:  # nosemgrep
+  postgres-fastagency-studio:  # nosemgrep
     image: postgres:latest
     container_name: $USER-postgres-py39-fastagency-studio
     environment: