chapkit 2.0.0__tar.gz → 2.0.1__tar.gz

{chapkit-2.0.0 → chapkit-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chapkit
-Version: 2.0.0
+Version: 2.0.1
 Summary: ML and data service modules built on servicekit - config, artifacts, and ML workflows
 Keywords: ml,machine-learning,data-science,artifacts,config,servicekit
 Author: Morten Hansen

{chapkit-2.0.0 → chapkit-2.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chapkit"
-version = "2.0.0"
+version = "2.0.1"
 description = "ML and data service modules built on servicekit - config, artifacts, and ML workflows"
 readme = "README.md"
 requires-python = ">=3.13"

{chapkit-2.0.0 → chapkit-2.0.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "chapkit"
-version = "2.0.0"
+version = "2.0.1"
 description = "ML and data service modules built on servicekit - config, artifacts, and ML workflows"
 readme = "README.md"
 authors = [{ name = "Morten Hansen", email = "morten@dhis2.org" }]

{chapkit-2.0.0 → chapkit-2.0.1}/src/chapkit/api/apps/console/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "Chapkit Console",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "prefix": "/",
   "description": "Default web console for exploring and operating a chapkit service",
   "author": "Chapkit Team",

{chapkit-2.0.0 → chapkit-2.0.1}/src/chapkit/api/service_builder.py

@@ -63,10 +63,15 @@ class AssessedStatus(StrEnum):
 
 
 class PeriodType(StrEnum):
-    """Supported period types for ML services."""
+    """Supported period types for ML services.
+
+    `any` declares that the model accepts both weekly and monthly data; chap-core
+    then skips its period-type check and dispatches whatever the dataset holds.
+    """
 
     weekly = "weekly"
     monthly = "monthly"
+    any = "any"
 
 
 class ModelMetadata(BaseModel):

{chapkit-2.0.0 → chapkit-2.0.1}/src/chapkit/cli/migrate.py

@@ -679,16 +679,16 @@ def detect_base_image(
 
 
 _VALID_ASSESSED_STATUS = {"gray", "red", "orange", "yellow", "green"}
-_VALID_PERIOD_TYPES = {"weekly", "monthly"}
+_VALID_PERIOD_TYPES = {"weekly", "monthly", "any"}
 
 
 def build_service_info_context(mlproject: MLProject) -> dict[str, Any]:
     """Build the ModelMetadata + capability-constraints block for MLServiceInfo.
 
     Handles the MLproject -> chapkit vocabulary mismatches:
-    - MLproject `supported_period_type: any` becomes `monthly` (chapkit's
-      PeriodType only has weekly/monthly); otherwise the declared value
-      passes through if recognised, else `monthly`.
+    - MLproject `supported_period_type` passes through when it is one of
+      chapkit's PeriodType values (weekly/monthly/any); anything else, or an
+      absent value, becomes `monthly`.
     - `author_assessed_status` is validated against chapkit's AssessedStatus
       enum; unknown values fall back to None.
     - URL-typed fields (organization_logo_url, repository_url,

{chapkit-2.0.0 → chapkit-2.0.1}/src/chapkit/cli/templates/migrate/CHAPKIT_migrate.md.jinja2

@@ -179,7 +179,7 @@ Your runtime deps (`[project.dependencies]`) have been auto-merged into the new
 
 ### [`MLServiceInfo`](https://dhis2-chap.github.io/chapkit/guides/ml-workflows/#mlserviceinfo-fields) — who you are
 
-The service's public identity and contract: `id`, `display_name`, `description`, [`model_metadata`](https://dhis2-chap.github.io/chapkit/guides/ml-workflows/#modelmetadata-fields), [`period_type`](https://dhis2-chap.github.io/chapkit/guides/ml-workflows/#mlserviceinfo-fields) (`monthly` / `weekly`), [`required_covariates`](#covariates). This is what chap-core reads via `/api/v1/info` when it decides whether to dispatch a dataset to your model.
+The service's public identity and contract: `id`, `display_name`, `description`, [`model_metadata`](https://dhis2-chap.github.io/chapkit/guides/ml-workflows/#modelmetadata-fields), [`period_type`](https://dhis2-chap.github.io/chapkit/guides/ml-workflows/#mlserviceinfo-fields) (`monthly` / `weekly` / `any`), [`required_covariates`](#covariates). This is what chap-core reads via `/api/v1/info` when it decides whether to dispatch a dataset to your model.
 
 ### [`ModelMetadata.author_assessed_status`](https://dhis2-chap.github.io/chapkit/guides/ml-workflows/#modelmetadata-fields) — traffic-light maturity
 

{chapkit-2.0.0 → chapkit-2.0.1}/src/chapkit/ml/router.py

@@ -100,7 +100,11 @@ class MLRouter(Router):
                 return DataFrame.model_validate(frame).with_schema(required_covariates=required_covariates).model_dump()
 
             requires_geo = bool(sample_metadata.get("requires_geo", False))
-            resolved_period = period_type or sample_metadata.get("period_type") or "monthly"
+            # A service declaring `any` accepts both formats; generate monthly rows for it.
+            declared_period = sample_metadata.get("period_type")
+            if declared_period not in ("monthly", "weekly"):
+                declared_period = None
+            resolved_period = period_type or declared_period or "monthly"
             want_geo = requires_geo if include_geo is None else include_geo
             geo = generator.generate_geo_data(num_features=num_locations, geo_type=geo_type) if want_geo else None