Ensure username is added to DB entries during creation. Rename 'run' …

…directory to 'runs'.

.gitignore

@@ -164,6 +164,6 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
-run/
+runs/
 keycloak-data/
 tests/htmlcov/

compose.dev.yml

@@ -9,17 +9,17 @@ services:
       - ${PWD}/sapporo:/app/sapporo
       - ${PWD}/tests:/app/tests
       # The ones below are mounted for cwltool and DinD.
-      - ${PWD}/run:${PWD}/run
+      - ${PWD}/runs:${PWD}/runs
       - /var/run/docker.sock:/var/run/docker.sock
       - /tmp:/tmp
     environment:
       # Priority: [CLI Args] -> [Env Vals] -> [Defaults]
       - SAPPORO_HOST=0.0.0.0
       - SAPPORO_PORT=1122
       - SAPPORO_DEBUG=True
-      - SAPPORO_RUN_DIR=${PWD}/run
+      - SAPPORO_RUN_DIR=${PWD}/runs
     ports:
-      - 127.0.0.1:1123:1122
+      - 127.0.0.1:1122:1122
     restart: on-failure
     working_dir: /app
     command: [ "sleep", "infinity" ]

compose.yml

@@ -4,20 +4,20 @@ services:
     container_name: sapporo-service
     volumes:
       # The ones below are mounted for cwltool and DinD.
-      - ${PWD}/run:${PWD}/run
+      - ${PWD}/runs:${PWD}/runs
       - /var/run/docker.sock:/var/run/docker.sock
       - /tmp:/tmp
     environment:
       # Priority: [CLI Args] -> [Env Vals] -> [Defaults]
       - SAPPORO_HOST=0.0.0.0
       - SAPPORO_PORT=1122
       - SAPPORO_DEBUG=False
-      - SAPPORO_RUN_DIR=${PWD}/run
+      - SAPPORO_RUN_DIR=${PWD}/runs
     ports:
       - 127.0.0.1:1122:1122
     restart: on-failure
     working_dir: /app
-    command: ["sapporo"]
+    command: [ "sapporo" ]
     networks:
       - sapporo-network
 

sapporo/database.py

@@ -22,7 +22,7 @@
 
 from sapporo.config import get_config
 from sapporo.factory import create_run_summary
-from sapporo.run import glob_all_run_ids
+from sapporo.run import glob_all_run_ids, read_file
 from sapporo.schemas import RunSummary, State
 from sapporo.utils import dt_to_time_str, time_str_to_dt
 
@@ -52,6 +52,8 @@ def get_session() -> Generator[Session, None, None]:
 
 
 class Run(SQLModel, table=True):  # type: ignore
+    __tablename__ = "runs"
+
     run_id: str = Field(primary_key=True)
     username: Optional[str] = None
     state: State
@@ -86,9 +88,10 @@ def init_db() -> None:
     with get_session() as session:
         for run_id in glob_all_run_ids():
             run_summary = create_run_summary(run_id)
+            username: Optional[str] = read_file(run_id, "username")
             run = Run(
                 run_id=run_summary.run_id,
-                username=None,
+                username=username,
                 state=run_summary.state,
                 start_time=run_summary.start_time and time_str_to_dt(run_summary.start_time),
                 end_time=run_summary.end_time and time_str_to_dt(run_summary.end_time),