Merge pull request #90 from jvivian/jvivian/issue89

Change repo / package name

.vscode/launch.json

@@ -13,8 +13,8 @@
             "justMyCode": true,
             "args": [
                 "run",
-                "covid19_drdfm/data/processed/data.h5ad",
-                "./covid19_drdfm/data/example-data/full-global-2",
+                "dfmdash/data/processed/data.h5ad",
+                "./dfmdash/data/example-data/full-global-2",
                 "--batch",
                 "State"
             ]

Makefile

@@ -44,6 +44,6 @@ help:
 
 .PHONY: dashboard
 dashboard:
-	@streamlit run covid19_drdfm/streamlit/Dashboard.py
+	@streamlit run dfmdash/streamlit/Dashboard.py
 
 .DEFAULT_GOAL := help

covid19_drdfm/cli.py → dfmdash/cli.py

@@ -18,9 +18,9 @@
 import typer
 from rich import print
 
-from covid19_drdfm.covid19 import get_project_h5ad
-from covid19_drdfm.dfm import ModelRunner
-from covid19_drdfm.io import DataLoader
+from dfmdash.covid19 import get_project_h5ad
+from dfmdash.dfm import ModelRunner
+from dfmdash.io import DataLoader
 
 app = typer.Typer()
 
@@ -69,14 +69,14 @@ def create_project_data(outdir: Path):
     print(f"Project data successfully created at {outdir}/data.h5ad !")
 
 
-@app.command("launch_dashboard")
-def launch_dashboard():
+@app.command("launch")
+def launch(port: str = 8501):
     """
-    Launch the Dashboard
+    Launch Dynamic Factor Dashboard
     """
     current_dir = Path(__file__).resolve().parent
     dashboard_path = current_dir / "streamlit" / "Dashboard.py"
-    subprocess.run(["streamlit", "run", dashboard_path])
+    subprocess.run(["streamlit", "run", dashboard_path, "--server.port", port])
 
 
 if __name__ == "__main__":

covid19_drdfm/covid19.py → dfmdash/covid19.py

@@ -7,7 +7,7 @@
 import yaml
 from anndata import AnnData
 
-from covid19_drdfm.constants import NAME_MAP
+from dfmdash.constants import NAME_MAP
 
 ROOT_DIR = Path(__file__).parent.absolute()
 DATA_DIR = ROOT_DIR / "data/processed"