Merge pull request #58 from nipreps/enh/dev-server

ENH: Minor improvements

.github/workflows/build.yml

@@ -24,6 +24,6 @@ jobs:
       - name: Start all the things
         run: docker compose up -d
       - name: Test the things
-        run: docker exec migas_server bash -c "pytest --pyargs migas_server"
+        run: docker exec migas-server bash -c "pytest --pyargs migas_server"
       - name: Stop all the things
         run: docker compose down

docker-compose.yml

@@ -2,7 +2,7 @@ services:
   # Migas API server
   server:
     build: .
-    container_name: "migas_server"
+    container_name: "migas-server"
     ports:
       - "8000:8000"
     depends_on:
@@ -59,3 +59,4 @@ services:
 # Network to link all services
 networks:
   migas:
+    name: migas

migas_server/cli.py

@@ -21,6 +21,7 @@ def _fmt_kv_pairs(value):
         "--headers",
         nargs='*',
         type=_fmt_kv_pairs,
+        default=[['X-Backend-Server', 'migas']],
         help="Custom HTTP response headers as 'Name:Value' pairs",
     )
     return parser

migas_server/connections.py

@@ -68,13 +68,19 @@ async def get_db_engine() -> AsyncEngine:
             from sqlalchemy.engine import URL
 
             db_url = URL.create(
-                drivername="postgresql+asyncpg",
                 username=os.getenv("DATABASE_USER"),
                 password=os.getenv("DATABASE_PASSWORD"),
                 database=os.getenv("DATABASE_NAME"),
             )
-            if gcp_conn := os.getenv("GCP_SQL_CONNECTION"):
-                # db_url.set(query={"unix_sock": f"/cloudsql/{gcp_conn}/.s.PGSQL.5432"})
+
+        else:
+            # Convert string to sqlalchemy URL
+            from sqlalchemy.engine import make_url
+
+            db_url = make_url(db_url)
+
+        db_url = db_url.set(drivername="postgresql+asyncpg")
+        if gcp_conn := os.getenv("GCP_SQL_CONNECTION"):
                 db_url = db_url.set(query={"host": f"/cloudsql/{gcp_conn}/.s.PGSQL.5432"})
 
         DB_ENGINE = create_async_engine(

migas_server/tests/test_parser.py

@@ -13,7 +13,7 @@ def test_parser_defaults():
 @pytest.mark.parametrize(
     'input,output',
     [
-        ([], None),
+        ([], [['X-Backend-Server', 'migas']]),
         (['Hello:There'], [['Hello', 'There']]),
         (['X-Backend-Server:migas', 'X-Test:1'], [['X-Backend-Server', 'migas'], ['X-Test', '1']]),
     ],