furu 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

furu/schema.py

@@ -0,0 +1,46 @@
+from __future__ import annotations
+
+import chz
+
+from .serialization.serializer import JsonValue
+
+
+def schema_key_from_furu_obj(furu_obj: dict[str, JsonValue]) -> tuple[str, ...]:
+    if not isinstance(furu_obj, dict):
+        raise TypeError(f"schema_key requires dict furu_obj, got {type(furu_obj)}")
+    keys: set[str] = set()
+    for key in furu_obj:
+        if not isinstance(key, str):
+            raise TypeError(f"schema_key requires string keys, got {type(key)}")
+        if key.startswith("_"):
+            continue
+        keys.add(key)
+    return tuple(sorted(keys))
+
+
+def schema_key_from_metadata_raw(metadata: dict[str, JsonValue]) -> tuple[str, ...]:
+    raw = metadata.get("schema_key")
+    if raw is None:
+        raise ValueError("metadata missing schema_key")
+    if isinstance(raw, tuple):
+        items = raw
+    elif isinstance(raw, list):
+        items = raw
+    else:
+        raise TypeError(f"metadata schema_key must be list or tuple, got {type(raw)}")
+    keys: list[str] = []
+    for item in items:
+        if not isinstance(item, str):
+            raise TypeError(f"metadata schema_key must be strings, got {type(item)}")
+        keys.append(item)
+    return tuple(keys)
+
+
+def schema_key_from_cls(cls: type) -> tuple[str, ...]:
+    fields = chz.chz_fields(cls)
+    keys = {
+        field.logical_name
+        for field in fields.values()
+        if not field.logical_name.startswith("_")
+    }
+    return tuple(sorted(keys))

furu/storage/metadata.py

@@ -1,5 +1,6 @@
 import datetime
 import getpass
+import importlib.metadata
 import json
 import os
 import platform
@@ -9,9 +10,10 @@ import sys
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, field_validator
 
 from ..config import FURU_CONFIG
+from ..schema import schema_key_from_furu_obj
 from ..serialization import BaseModel as PydanticBaseModel
 from ..serialization import FuruSerializer
 from ..serialization.serializer import JsonValue
@@ -50,6 +52,7 @@ class EnvironmentInfo(BaseModel):
 
     timestamp: str
     command: str
+    furu_package_version: str | None = None
     python_version: str
     executable: str
     platform: str
@@ -66,6 +69,7 @@ class FuruMetadata(BaseModel):
     # Furu-specific fields
     furu_python_def: str
     furu_obj: JsonValue  # Serialized Furu object from FuruSerializer.to_dict()
+    schema_key: tuple[str, ...]
     furu_hash: str
     furu_path: str
 
@@ -79,6 +83,7 @@ class FuruMetadata(BaseModel):
     # Environment info
     timestamp: str
     command: str
+    furu_package_version: str | None = None
     python_version: str
     executable: str
     platform: str
@@ -86,6 +91,13 @@ class FuruMetadata(BaseModel):
     user: str
     pid: int
 
+    @field_validator("schema_key", mode="before")
+    @classmethod
+    def _coerce_schema_key(cls, value: object) -> object:
+        if isinstance(value, list):
+            return tuple(value)
+        return value
+
 
 class MetadataManager:
     """Handles metadata collection and storage."""
@@ -217,6 +229,7 @@ class MetadataManager:
                 timespec="microseconds"
             ),
             command=" ".join(sys.argv) if sys.argv else "<unknown>",
+            furu_package_version=importlib.metadata.version("furu"),
             python_version=sys.version,
             executable=sys.executable,
             platform=platform.platform(),
@@ -238,10 +251,12 @@ class MetadataManager:
             raise TypeError(
                 f"Expected FuruSerializer.to_dict to return dict, got {type(serialized_obj)}"
             )
+        schema_key = schema_key_from_furu_obj(serialized_obj)
 
         return FuruMetadata(
             furu_python_def=FuruSerializer.to_python(furu_obj, multiline=False),
             furu_obj=serialized_obj,
+            schema_key=schema_key,
             furu_hash=FuruSerializer.compute_hash(furu_obj),
             furu_path=str(directory.resolve()),
             git_commit=git_info.git_commit,
@@ -251,6 +266,7 @@ class MetadataManager:
             git_submodules=git_info.git_submodules,
             timestamp=env_info.timestamp,
             command=env_info.command,
+            furu_package_version=env_info.furu_package_version,
             python_version=env_info.python_version,
             executable=env_info.executable,
             platform=env_info.platform,

{furu-0.0.6.dist-info → furu-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: furu
-Version: 0.0.6
+Version: 0.0.7
 Summary: Cacheable, nested pipelines for Python. Define computations as configs; furu handles caching, state tracking, and result reuse across runs.
 Author: Herman Brunborg
 Author-email: Herman Brunborg <herman@brunborg.com>

{furu-0.0.6.dist-info → furu-0.0.7.dist-info}/RECORD

@@ -1,21 +1,22 @@
-furu/__init__.py,sha256=Z8VssTuQm2nH7bgB8SQc8pXsNGc-H1QGHFffKzNzqk8,2018
+furu/__init__.py,sha256=umlKxb3zB5KYsx3meqLFzqNRduGfEVUplTZSelX-p4E,1729
 furu/adapters/__init__.py,sha256=onLzEj9hccPK15g8a8va2T19nqQXoxb9rQlJIjKSKnE,69
 furu/adapters/submitit.py,sha256=FV3XEUSQuS5vIyzkW-Iuqtf8SRL-fsokPG67u7tMF5I,7276
+furu/aliases.py,sha256=C31Oe2w8gTAuVjo-eKCs_Xp3Ir16HRyn327CeczuO6c,1755
 furu/config.py,sha256=UGnH8QAKMUgrGMGNkfBgLXideXEpDlozUSsX9iNN8Lw,6844
 furu/core/__init__.py,sha256=6hH7i6r627c0FZn6eQVsSG7LD4QmTta6iQw0AiPQPTM,156
-furu/core/furu.py,sha256=2KTeMjQjRoDaXNIoKUlYmJ0JWJFG4krom7w6UsUpvDg,61785
+furu/core/furu.py,sha256=PBz9_gykog9J-QY45pt99DR5f03ssFys1DhiEPBRAQA,66692
 furu/core/list.py,sha256=QaGSh8NFg1K2WFncM8duOYQ6KLZ6EW2pRLArN_e5Juw,3662
 furu/dashboard/__init__.py,sha256=ziAordJfkbbXNIM7iA9O7vR2gsCq34AInYiMYOCfWOc,362
 furu/dashboard/__main__.py,sha256=cNs65IMl4kwZFpxa9xLXmFSy4-M5D1X1ZBfTDxW11vo,144
 furu/dashboard/api/__init__.py,sha256=9-WyWOt-VQJJBIsdW29D-7JvR-BivJd9G_SRaRptCz0,80
-furu/dashboard/api/models.py,sha256=SCu-kLJyW7dwSKswdgQNS3wQuj25ORs0pHkvX9xBbo4,4767
-furu/dashboard/api/routes.py,sha256=iZez0khIUvbgfeSoy1BJvmoEEbgUrdSQA8SN8iAIkM8,4813
+furu/dashboard/api/models.py,sha256=ptC1NKMl2zGb8ERR7JY_EQBi-Zxc4NvNhnFxcOsBawk,5133
+furu/dashboard/api/routes.py,sha256=TCGTceH-i7dv1Y6JE4JFBcmyOs6QTTDRp5zdjwuBpPQ,5035
 furu/dashboard/frontend/dist/assets/index-BXAIKNNr.css,sha256=qhsN0Td3mM-GAR8mZ0CtocynABLKa1ncl9ioDrTKOIQ,34768
-furu/dashboard/frontend/dist/assets/index-BjyrY-Zz.js,sha256=fItsQ--Dzobq5KdUcuqDi4txM2-NNqx8JET5Lwkwf7U,544515
+furu/dashboard/frontend/dist/assets/index-NiDdQnqO.js,sha256=Ns1BosYU5xckMAn_b4iUtD6-m7tB9r3GY7_rwFgzumI,545103
 furu/dashboard/frontend/dist/favicon.svg,sha256=3TSLHNZITFe3JTPoYHZnDgiGsJxIzf39v97l2A1Hodo,369
-furu/dashboard/frontend/dist/index.html,sha256=Ig-j0qgTXBSge0GN7PaM7mcLnuRhRMQmkTZjU1wmTXY,810
+furu/dashboard/frontend/dist/index.html,sha256=i7eDqiisdL86W0ZldsUg3z5wsX1NfH98adPxgh0p06Q,810
 furu/dashboard/main.py,sha256=gj9Cdj2qyaSCEkmfNHUMQXlXv6GpWTQ9IZEi7WzlCSo,4463
-furu/dashboard/scanner.py,sha256=qXCvkvFByBc09TUdth5Js67rS8zpRBlRkVQ9dJ7YbdE,34696
+furu/dashboard/scanner.py,sha256=CMLcUTZ2mvaigpMM1qbonpPwvG8Om_FIVd11PruSZFo,35467
 furu/errors.py,sha256=FFbV4M0-ipVGizv5ee80L-NZFVjaRjy8i19mClr6R0g,3959
 furu/execution/__init__.py,sha256=ixVw1Shvg2ulS597OYYeGgSSTwv25j_McuQdDXIiEL8,625
 furu/execution/context.py,sha256=0tAbM0azqEus8hknf_A9-Zs9Sq99bnUkFyV4RO4ZMRU,666
@@ -27,22 +28,22 @@ furu/execution/slurm_dag.py,sha256=xh9EUGdPZaAH3UfcRqo6MsKYBIV-UW3_7owY8kLOwz4,9
 furu/execution/slurm_pool.py,sha256=ft76Gp-HgFWWjGvDclUChLOjY1rvhhfkP5mxhK3ViQk,30395
 furu/execution/slurm_spec.py,sha256=DG8BF4FCga2ZXsqGUvfNibk6II40JcShVZ4jTwxTdec,977
 furu/execution/submitit_factory.py,sha256=B2vkDtmscuAX0sBaj9V5pNlgOtkkV35yJ1fZ7A-DSvU,1119
-furu/migrate.py,sha256=x_Uh7oXAv40L5ZAHJhdnw-o7ct56rWUSZLbHHfRObeY,1313
-furu/migration.py,sha256=EYWULuH8lEVvESthO2qEF95WJTo1Uj6d4L6VU2zmWpw,31350
+furu/migration.py,sha256=OG-GvDscZYNY0Mz8nQJ-F7tWW9Ev6iUwTKOyc6uwBpc,21058
 furu/runtime/__init__.py,sha256=fQqE7wUuWunLD73Vm3lss7BFSij3UVxXOKQXBAOS8zw,504
 furu/runtime/env.py,sha256=lb-LWl-1EM_CP8sy0z3HAY20NXQ-v3QdOgte1i0HYVA,214
 furu/runtime/logging.py,sha256=Xni1hWyH21bKc6D2owBZzThsj6q8yQOBD9zUrDS4jtI,10760
 furu/runtime/overrides.py,sha256=E3fsZ0ReNOnC9xioHHFlmudm5K2DZLFFcEIvrnA6t2o,871
 furu/runtime/tracebacks.py,sha256=PGCuOq8QkWSoun791gjUXM8frOP2wWV8IBlqaA4nuGE,1631
+furu/schema.py,sha256=t-XyapYJpYQEmLFo-PGwrCUzfAG-WefTi3OYbveRp0Y,1453
 furu/serialization/__init__.py,sha256=L7oHuIbxdSh7GCY3thMQnDwlt_ERH-TMy0YKEAZLrPs,341
 furu/serialization/migrations.py,sha256=HD5g8JCBdH3Y0rHJYc4Ug1IXBVcUDxLE7nfiXZnXcUE,7772
 furu/serialization/serializer.py,sha256=_nfUaAOy_KHegvfXlpPh4rCuvkzalJva75OvDg5nXiI,10114
 furu/storage/__init__.py,sha256=cLLL-GPpSu9C72Mdk5S6TGu3g-SnBfEuxzfpx5ZJPtw,616
-furu/storage/metadata.py,sha256=V16aePXsVo4qIBsKCVtNQvZDpMl0AcCCD2Fr-f-Q75I,9659
+furu/storage/metadata.py,sha256=EYT4sRSFz2KY3nlc4DAJBfxuvi2rQedPjPK_NGJlQ3k,10313
 furu/storage/migration.py,sha256=FNExLdPu1ekKZR2XJkAgags9U8pV2FfkKAECSXkSra8,2585
 furu/storage/state.py,sha256=kcIfAwdKWT8Q2ElbC5qofQC6noS_k6eNSPkNAdYXoaY,43707
 furu/testing.py,sha256=lS-30bOu_RI1l4OV4lGWNpx5HOAwX2JYHHqakOkz8so,7804
-furu-0.0.6.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-furu-0.0.6.dist-info/entry_points.txt,sha256=hZkjtFzNlb33Zk-aUfLMRj-XgVDxdT82-JXG9d4bu2E,60
-furu-0.0.6.dist-info/METADATA,sha256=Z22LYfC7htpUg9VleX9vYA-GlruCYyycpe8VTpm5aYQ,19117
-furu-0.0.6.dist-info/RECORD,,
+furu-0.0.7.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+furu-0.0.7.dist-info/entry_points.txt,sha256=hZkjtFzNlb33Zk-aUfLMRj-XgVDxdT82-JXG9d4bu2E,60
+furu-0.0.7.dist-info/METADATA,sha256=v6gNqvq19H4H9WPMl2PcaDIOZVP1Qtz1lQfzBMzN0Yc,19117
+furu-0.0.7.dist-info/RECORD,,

furu/migrate.py

@@ -1,48 +0,0 @@
-from __future__ import annotations
-
-from typing import Literal, Mapping
-
-from .core.furu import Furu
-from .migration import (
-    MigrationValue,
-    apply_migration,
-    find_migration_candidates_initialized_target,
-)
-from .storage import MigrationRecord
-
-
-MigrationPolicy = Literal["alias", "move", "copy"]
-
-
-def migrate(
-    from_obj: Furu,
-    to_obj: Furu,
-    *,
-    policy: MigrationPolicy = "alias",
-    origin: str | None = None,
-    note: str | None = None,
-    default_values: Mapping[str, MigrationValue] | None = None,
-) -> MigrationRecord:
-    from_namespace = ".".join(from_obj._namespace().parts)
-    candidates = find_migration_candidates_initialized_target(
-        to_obj=to_obj,
-        from_namespace=from_namespace,
-        default_fields=None,
-        drop_fields=None,
-    )
-    if not candidates:
-        raise ValueError("migration: no candidates found for initialized target")
-    if len(candidates) != 1:
-        raise ValueError("migration: expected exactly one candidate")
-    candidate = candidates[0]
-    if default_values:
-        candidate = candidate.with_default_values(default_values)
-    records = apply_migration(
-        candidate,
-        policy=policy,
-        cascade=True,
-        origin=origin,
-        note=note,
-        conflict="throw",
-    )
-    return records[0]