Merge pull request #16 from The-Strategy-Unit/v4-3_update

v4.3 update

Author: yiwen-h

notebooks/nhp_model_run-icb.ipynb

@@ -34,7 +34,7 @@
     "from databricks.sdk import WorkspaceClient\n",
     "\n",
     "from nhp.databricks.icb import DatabricksICB\n",
-    "from nhp.model.helpers import load_params\n",
+    "from nhp.model.params import load_params\n",
     "from nhp.model.run import run_all"
    ]
   },
@@ -86,9 +86,7 @@
     "params_path = dbutils.widgets.get(\"params_path\")\n",
     "\n",
     "data_path  = dbutils.widgets.get(\"data_path\")\n",
-    "save_full_model_results = dbutils.widgets.get(\"save_full_model_results\") == \"True\"\n",
-    "# TODO: this will need to be updated with each new release manually\n",
-    "outputs_version = \"v4.2\""
+    "save_full_model_results = dbutils.widgets.get(\"save_full_model_results\") == \"True\"\n"
    ]
   },
   {
@@ -115,6 +113,8 @@
    "source": [
     "params = load_params(params_path)\n",
     "\n",
+    "outputs_version = params[\"app_version\"]\n",
+    "\n",
     "params[\"create_datetime\"] = f\"{datetime.now():%Y%m%d_%H%M%S}\"\n",
     "\n",
     "metadata = {\n",

notebooks/nhp_model_run-national.ipynb

@@ -34,7 +34,7 @@
     "from databricks.sdk import WorkspaceClient\n",
     "\n",
     "from nhp.databricks.national import DatabricksNational\n",
-    "from nhp.model.helpers import load_params\n",
+    "from nhp.model.params import load_params\n",
     "from nhp.model.run import run_all"
    ]
   },
@@ -86,9 +86,7 @@
     "params_path = dbutils.widgets.get(\"params_path\")\n",
     "\n",
     "data_path  = dbutils.widgets.get(\"data_path\")\n",
-    "save_full_model_results = dbutils.widgets.get(\"save_full_model_results\") == \"True\"\n",
-    "# TODO: this will need to be updated with each new release manually\n",
-    "outputs_version = \"v4.2\""
+    "save_full_model_results = dbutils.widgets.get(\"save_full_model_results\") == \"True\""
    ]
   },
   {
@@ -115,6 +113,8 @@
    "source": [
     "params = load_params(params_path)\n",
     "\n",
+    "outputs_version = params[\"app_version\"]\n",
+    "\n",
     "params[\"create_datetime\"] = f\"{datetime.now():%Y%m%d_%H%M%S}\"\n",
     "\n",
     "metadata = {\n",

notebooks/nhp_model_run-provider.ipynb

@@ -34,7 +34,7 @@
         "from databricks.sdk import WorkspaceClient\n",
         "\n",
         "from nhp.databricks.provider import DatabricksProvider\n",
-        "from nhp.model.helpers import load_params\n",
+        "from nhp.model.params import load_params\n",
         "from nhp.model.run import run_all"
       ]
     },
@@ -86,9 +86,7 @@
         "params_path = dbutils.widgets.get(\"params_path\")\n",
         "\n",
         "data_path  = dbutils.widgets.get(\"data_path\")\n",
-        "save_full_model_results = dbutils.widgets.get(\"save_full_model_results\") == \"True\"\n",
-        "# TODO: this will need to be updated with each new release manually\n",
-        "outputs_version = \"v4.2\""
+        "save_full_model_results = dbutils.widgets.get(\"save_full_model_results\") == \"True\""
       ]
     },
     {
@@ -115,6 +113,8 @@
       "source": [
         "params = load_params(params_path)\n",
         "\n",
+        "outputs_version = params[\"app_version\"]\n",
+        "\n",
         "params[\"create_datetime\"] = f\"{datetime.now():%Y%m%d_%H%M%S}\"\n",
         "\n",
         "metadata = {\n",
@@ -417,4 +417,4 @@
   },
   "nbformat": 4,
   "nbformat_minor": 0
-}
+}

pyproject.toml

@@ -7,7 +7,7 @@ requires-python = ">=3.12"
 
 dependencies = [
     "databricks-connect>=16.1.6",
-    "nhp-model @ git+https://github.com/the-strategy-unit/[email protected]",
+    "nhp-model",
     "pandas>=2.3.2",
     "pyspark>=3.5.6",
 ]
@@ -75,3 +75,6 @@ version_file = "src/nhp/_version.py"
 
 [tool.ty.src]
 exclude = ["notebooks"]
+
+[tool.uv.sources]
+nhp-model = { git = "https://github.com/the-strategy-unit/nhp_model.git", rev = "v4.3.0" }

resources/nhp_model_run-icb.yml

@@ -1,7 +1,7 @@
 resources:
   jobs:
-    NHP_Model-v4_2_1-Run_ICB:
-      name: NHP Model v4.2.1 Run (ICB)
+    NHP_Model-v4_3-Run_ICB:
+      name: NHP Model v4.3.0 Run (ICB)
       tasks:
         - task_key: list_files
           notebook_task:
@@ -47,6 +47,6 @@ resources:
         - name: queue_path
           default: "/Volumes/nhp/model_data/queue/icb/"
         - name: data_path
-          default: "/Volumes/nhp/model_data/files/v4.2.1/"
+          default: "/Volumes/nhp/model_data/files/v4.3.0/"
         - name: save_full_model_results
           default: "false"

resources/nhp_model_run-national.yml

@@ -1,7 +1,7 @@
 resources:
   jobs:
-    NHP_Model-v4_2_1-Run_National:
-      name: NHP Model v4.2.1 Run (National)
+    NHP_Model-v4_3-Run_National:
+      name: NHP Model v4.3.0 Run (National)
       tasks:
         - task_key: list_files
           notebook_task:
@@ -47,6 +47,6 @@ resources:
         - name: queue_path
           default: "/Volumes/nhp/model_data/queue/national/"
         - name: data_path
-          default: "/Volumes/nhp/model_data/files/v4.2.1/"
+          default: "/Volumes/nhp/model_data/files/v4.3.0/"
         - name: save_full_model_results
           default: "false"

resources/nhp_model_run-provider.yml

@@ -1,7 +1,7 @@
 resources:
   jobs:
-    NHP_Model-v4_2_1-Run_Provider:
-      name: NHP Model v4.2.1 Run (Provider)
+    NHP_Model-v4_3-Run_Provider:
+      name: NHP Model v4.3.0 Run (Provider)
       tasks:
         - task_key: list_files
           notebook_task:
@@ -47,6 +47,6 @@ resources:
         - name: queue_path
           default: "/Volumes/nhp/model_data/queue/provider/"
         - name: data_path
-          default: "/Volumes/nhp/model_data/files/v.4.2.1/"
+          default: "/Volumes/nhp/model_data/files/v4.3.0/"
         - name: save_full_model_results
           default: "false"