metafold 0.7.0__tar.gz → 0.8.dev1__tar.gz

{metafold-0.7.0 → metafold-0.8.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: metafold
-Version: 0.7.0
+Version: 0.8.dev1
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.7.0 → metafold-0.8.dev1}/metafold/__init__.py

@@ -2,6 +2,7 @@ from metafold.client import Client
 from metafold.projects import ProjectsEndpoint
 from metafold.assets import AssetsEndpoint
 from metafold.jobs import JobsEndpoint
+from metafold.workflows import WorkflowsEndpoint
 from metafold.auth import AuthProvider
 from typing import Optional
 
@@ -17,6 +18,7 @@ class MetafoldClient(Client):
     projects: ProjectsEndpoint
     assets: AssetsEndpoint
     jobs: JobsEndpoint
+    workflows: WorkflowsEndpoint
 
     def __init__(
         self,
@@ -48,3 +50,4 @@ class MetafoldClient(Client):
         self.projects = ProjectsEndpoint(self)
         self.assets = AssetsEndpoint(self)
         self.jobs = JobsEndpoint(self)
+        self.workflows = WorkflowsEndpoint(self)

{metafold-0.7.0 → metafold-0.8.dev1}/metafold/api.py

@@ -2,20 +2,6 @@ from datetime import datetime, timezone
 from functools import wraps
 from typing import Any, Callable, Optional, TypeVar, Union
 
-T = TypeVar("T")
-U = TypeVar("U")
-
-
-def optional(f: Callable[[T], U]) -> Callable[[Optional[T]], Optional[U]]:
-    """Decorator to generate converters that accept optional values."""
-    @wraps(f)
-    def decorator(v: Optional[T]) -> Optional[U]:
-        if v is None:
-            return v
-        return f(v)
-
-    return decorator
-
 
 def asdatetime(s: Union[str, datetime]) -> datetime:
     """Parse Metafold API datetime.
@@ -38,3 +24,21 @@ def asdict(**kwargs: Any) -> dict[str, Any]:
         if v is not None:
             d[k] = v
     return d
+
+
+T = TypeVar("T")
+U = TypeVar("U")
+
+
+def optional(f: Callable[[T], U]) -> Callable[[Optional[T]], Optional[U]]:
+    """Decorator to generate converters that accept optional values."""
+    @wraps(f)
+    def decorator(v: Optional[T]) -> Optional[U]:
+        if v is None:
+            return None
+        return f(v)
+
+    return decorator
+
+
+optional_datetime = optional(asdatetime)

{metafold-0.7.0 → metafold-0.8.dev1}/metafold/assets.py

@@ -115,30 +115,6 @@ class AssetsEndpoint:
             fp.close()
         return Asset(**r.json())
 
-    def update(
-        self, asset_id: str,
-        f: Union[str, bytes, PathLike, IO[bytes]],
-        project_id: Optional[str] = None,
-    ) -> Asset:
-        """Update an asset.
-
-        Args:
-            asset_id: ID of asset to update.
-            f: File-like object (opened in binary mode) or path to file on disk.
-            project_id: Asset project ID.
-
-        Returns:
-            Updated asset resource.
-        """
-        project_id = self._client.project_id(project_id)
-        fp: IO[bytes] = _open_file(f)
-        try:
-            url = f"/projects/{project_id}/assets/{asset_id}"
-            r: Response = self._client.patch(url, files={"file": fp})
-        finally:
-            fp.close()
-        return Asset(**r.json())
-
     def delete(self, asset_id: str, project_id: Optional[str] = None) -> None:
         """Delete an asset.
 

{metafold-0.7.0 → metafold-0.8.dev1}/metafold/client.py

@@ -1,8 +1,10 @@
 from metafold.auth import AuthProvider
+from metafold.exceptions import PollTimeout
 from requests import HTTPError, Response, Session
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Optional, Union
 from urllib.parse import urljoin
 import platform
+import time
 
 
 class Client:
@@ -74,3 +76,29 @@ class Client:
 
     def delete(self, url: str, *args: Any, **kwargs: Any) ->  Response:
         return self._request(self._session.delete, url, *args, **kwargs)
+
+    def poll(
+        self, url: str,
+        timeout: Union[int, float] = 120,
+        every: Union[int, float] = 1,
+        ) -> Response:
+        """Poll the given URL in regular intervals.
+
+        Helpful for waiting on async processes given a status URL.
+
+        Args:
+            timeout: Time in seconds to wait for a result.
+            every: Frequency in seconds.
+
+        Returns:
+            HTTP response.
+        """
+        t0 = time.monotonic()
+        r = self.get(url)
+        while r.status_code == 202:
+            elapsed = time.monotonic() - t0
+            if elapsed >= timeout:
+                raise PollTimeout(f"Polling timed out: {url}")
+            time.sleep(1)
+            r = self.get(url)
+        return r

{metafold-0.7.0 → metafold-0.8.dev1}/metafold/func.py

@@ -100,6 +100,44 @@ class CSG(TypedFunc[Literal[FuncType.FLOAT]]):
         return cast(TypedResult[Literal[FuncType.FLOAT]], r)
 
 
+ComputeCurvatures_Enum_spacing_type: TypeAlias = Literal["Continuous", "Discrete"]
+
+
+class ComputeCurvatures_Parameters(TypedDict, total=False):
+    spacing_type: ComputeCurvatures_Enum_spacing_type
+    step_size: float
+    volume_size: Vec3f
+
+
+class ComputeCurvatures(TypedFunc[Literal[FuncType.VEC3F]]):
+    def __init__(
+        self,
+        samples: Func,
+        parameters: Optional[ComputeCurvatures_Parameters] = None,
+    ):
+        self.inputs: Optional[dict[str, Func]]
+        self.inputs = {
+            "Samples": samples,
+        }
+        self.assets: Optional[Assets]
+        self.assets = None
+        self.parameters = parameters
+
+    @cache
+    def __call__(self, eval_: Evaluator) -> TypedResult[Literal[FuncType.VEC3F]]:
+        inputs: Optional[Inputs] = None
+        if self.inputs:
+            inputs = dict((k, v(eval_)) for k, v in self.inputs.items())
+        r = eval_(
+            "ComputeCurvatures",
+            inputs=inputs,
+            assets=self.assets,
+            # https://github.com/python/mypy/issues/4976#issuecomment-460971843
+            parameters=cast(Optional[Params], self.parameters),
+        )
+        return cast(TypedResult[Literal[FuncType.VEC3F]], r)
+
+
 class ComputeNormals_Parameters(TypedDict, total=False):
     volume_offset: Vec3f
     volume_size: Vec3f
@@ -608,6 +646,7 @@ class SampleLattice(TypedFunc[Literal[FuncType.FLOAT]]):
 class SampleSpinodoid_Parameters(TypedDict, total=False):
     angles: Vec3f
     density: float
+    pore_size: float
     wave_count: int
     xform: Mat4f
 

{metafold-0.7.0 → metafold-0.8.dev1}/metafold/jobs.py

@@ -1,18 +1,50 @@
 from attrs import field, frozen
 from datetime import datetime
-from metafold.api import asdatetime, asdict, optional
+from metafold.api import asdatetime, asdict, optional, optional_datetime
 from metafold.assets import Asset
 from metafold.client import Client
 from metafold.exceptions import PollTimeout
 from requests import Response
-from typing import Any, Optional, Union
-import time
+from typing import Any, Optional, TypedDict, Union
+from typing_extensions import TypeAlias
 
 
 def _assets(v: list[Union[dict[str, Any], Asset]]) -> list[Asset]:
     return [a if isinstance(a, Asset) else Asset(**a) for a in v]
 
 
+AssetDict: TypeAlias = dict[str, Union[dict[str, Any], Asset]]
+
+
+def _assets_dict(v: AssetDict) -> dict[str, Asset]:
+    return dict(
+        (k, a if isinstance(a, Asset) else Asset(**a))
+        for k, a in v.items()
+    )
+
+
+class IODict(TypedDict):
+    params: Optional[dict[str, Any]]
+    assets: Optional[dict[str, AssetDict]]
+
+
+@frozen(kw_only=True)
+class IO:
+    """Job input/output.
+
+    Attributes:
+        params: JSON-encoded parameter values.
+        assets: Related assets.
+    """
+    params: Optional[dict[str, Any]] = None
+    assets: Optional[dict[str, Asset]] = field(
+        converter=lambda v: optional(_assets_dict)(v), default=None)
+
+    @staticmethod
+    def from_dict(d: IODict) -> "IO":
+        return IO(params=d.get("params"), assets=d.get("assets"))
+
+
 @frozen(kw_only=True)
 class Job:
     """Job resource.
@@ -21,24 +53,35 @@ class Job:
         id: Job ID.
         name: Job name.
         type: Job type.
-        parameters: Job parameters.
+        state: Job state. May be one of: pending, started, success, failure, or
+            canceled.
         created: Job creation datetime.
+        started: Job started datetime.
         finished: Job finished datetime.
-        state: Job state. May be one of: pending, started, success, or failure.
-        assets: List of generated asset resources.
-        meta: Additional metadata generated by the job.
+        error: Error message for failed jobs.
+        inputs: Input assets and parameters.
+        outputs: Output assets and parameters.
+        assets: (Deprecated) List of generated asset resources.
+        parameters: (Deprecated) Job parameters.
+        meta: (Deprecated) Additional metadata generated by the job.
     """
     id: str
     name: Optional[str] = None
     type: str
-    parameters: dict[str, Any]
+    state: str
     created: datetime = field(converter=asdatetime)
+    started: Optional[datetime] = field(
+        converter=lambda v: optional_datetime(v), default=None)
     finished: Optional[datetime] = field(
-        converter=lambda v: optional(asdatetime)(v),
-        default=None,
-    )
-    state: str
-    assets: list[Asset] = field(converter=_assets)
+        converter=lambda v: optional_datetime(v), default=None)
+    error: Optional[str] = None
+    inputs: IO = field(converter=lambda v: v if isinstance(v, IO) else IO.from_dict(v))
+    outputs: IO = field(converter=lambda v: v if isinstance(v, IO) else IO.from_dict(v))
+    needs: list[str]
+    # NOTE(ryan): Deprecated
+    assets: Optional[list[Asset]] = field(
+        converter=lambda v: optional(_assets)(v), default=None)
+    parameters: dict[str, Any]
     meta: dict[str, Any]
 
 
@@ -58,7 +101,8 @@ class JobsEndpoint:
 
         Args:
             sort: Sort string. For details on syntax see the Metafold API docs.
-                Supported sorting fields are: "id", "name", or "created".
+                Supported sorting fields are: "id", "name", "created", "started", or
+                "finished".
             q: Query string. For details on syntax see the Metafold API docs.
                 Supported search fields are: "id", "name", "type", and "state".
             project_id: Job project ID.
@@ -139,31 +183,8 @@ class JobsEndpoint:
         r: Response = self._client.post(f"/projects/{project_id}/jobs", json=payload)
         return r.json()["link"]
 
-    def poll(
-        self, url: str,
-        timeout: Union[int, float] = 120,
-        every: Union[int, float] = 1,
-    ) -> Response:
-        """Poll the given URL in regular intervals.
-
-        Helpful for waiting on job results given a status URL.
-
-        Args:
-            timeout: Time in seconds to wait for a result.
-            every: Frequency in seconds.
-
-        Returns:
-            HTTP response.
-        """
-        t0 = time.monotonic()
-        r = self._client.get(url)
-        while r.status_code == 202:
-            elapsed = time.monotonic() - t0
-            if elapsed >= timeout:
-                raise PollTimeout("Job timed out")
-            time.sleep(1)
-            r = self._client.get(url)
-        return r
+    def poll(self, *args, **kwargs):
+        return self._client.poll(*args, **kwargs)
 
     def update(
         self, job_id: str,
@@ -185,3 +206,14 @@ class JobsEndpoint:
         payload = asdict(name=name)
         r: Response = self._client.patch(url, data=payload)
         return Job(**r.json())
+
+    def delete(self, job_id: str, project_id: Optional[str] = None):
+        """Delete a job.
+
+        Args:
+            job_id: ID of job to delete.
+            project_id: Job project ID.
+        """
+        project_id = self._client.project_id(project_id)
+        url = f"/projects/{project_id}/jobs/{job_id}"
+        self._client.delete(url)

{metafold-0.7.0 → metafold-0.8.dev1}/metafold/utils.py

@@ -7,24 +7,21 @@ import numpy as np
 def xform(
     translation: Optional[ArrayLike] = None,
     rotation: Optional[ArrayLike] = None,
-    scale: Optional[ArrayLike] = None,
 ) -> np.ndarray:
     """Compose transformation matrix.
 
        Args:
             translation: Translation in the x, y, and z directions.
             rotation: Euler angles in degrees. Rotation is applied in the order Rz, Ry, Rx.
-            scale: Scale factor applied in the x, y, z directions before rotation.
 
         Returns:
             4 x 4 affine transformation matrix.
     """
     translation = translation or np.array([0.0, 0.0, 0.0])
     rotation = rotation or np.array([0.0, 0.0, 0.0])
-    scale = scale or np.array([1.0, 1.0, 1.0])
 
     r = R.from_euler("xyz", rotation,  degrees=True).as_matrix()
     m = np.eye(4)
-    m[:3, :3] = np.diag(scale) @ r
+    m[:3, :3] = r
     m[3, :3] = translation
     return m

metafold-0.8.dev1/metafold/workflows.py

@@ -0,0 +1,137 @@
+from attrs import field, frozen
+from datetime import datetime
+from metafold.api import asdatetime, asdict, optional_datetime
+from metafold.client import Client
+from metafold.exceptions import PollTimeout
+from requests import Response
+from typing import Optional, Union
+
+
+@frozen(kw_only=True)
+class Workflow:
+    """Workflow resource.
+
+    Attributes:
+        id: Workflow ID.
+        state: Workflow state. May be one of: pending, started, success, failure, or
+            canceled.
+        created: Workflow creation datetime.
+        started: Workflow started datetime.
+        finished: Workflow finished datetime.
+        definition: Workflow definition string.
+    """
+    id: str
+    jobs: list[str] = field(factory=list)
+    state: str
+    created: datetime = field(converter=asdatetime)
+    started: Optional[datetime] = field(
+        converter=lambda v: optional_datetime(v), default=None)
+    finished: Optional[datetime] = field(
+        converter=lambda v: optional_datetime(v), default=None)
+    definition: str
+
+
+class WorkflowsEndpoint:
+    """Metafold workflows endpoint."""
+
+    def __init__(self, client: Client) -> None:
+        self._client = client
+
+    def list(
+        self,
+        sort: Optional[str] = None,
+        q: Optional[str] = None,
+        project_id: Optional[str] = None,
+    ) -> list[Workflow]:
+        """List jobs.
+
+        Args:
+            sort: Sort string. For details on syntax see the Metafold API docs.
+                Supported sorting fields are: "id", "created", "started", or "finished".
+            q: Query string. For details on syntax see the Metafold API docs.
+                Supported search fields are: "id" and "state".
+            project_id: Workflow project ID.
+
+        Returns:
+            List of job resources.
+        """
+        project_id = self._client.project_id(project_id)
+        url = f"/projects/{project_id}/workflows"
+        payload = asdict(sort=sort, q=q)
+        r: Response = self._client.get(url, params=payload)
+        return [Workflow(**w) for w in r.json()]
+
+    def get(self, workflow_id: str, project_id: Optional[str] = None) -> Workflow:
+        """Get a workflow.
+
+        Args:
+            workflow_id: ID of workflow to get.
+            project_id: Workflow project ID.
+
+        Returns:
+            Workflow resource.
+        """
+        project_id = self._client.project_id(project_id)
+        url = f"/projects/{project_id}/workflows/{workflow_id}"
+        r: Response = self._client.get(url)
+        return Workflow(**r.json())
+
+    def run(
+        self, definition: str,
+        parameters: Optional[dict[str, str]] = None,
+        assets: Optional[dict[str, str]] = None,
+        timeout: Union[int, float] = 120,
+        project_id: Optional[str] = None,
+    ) -> Workflow:
+        """Dispatch a new workflow and wait for it to complete.
+
+        Workflow completion does not indicate success. Access the completed workflow's
+        state to check for success/failure.
+
+        Args:
+            definition: Workflow definition YAML.
+            parameters: Parameter mapping for jobs in the definition.
+            assets: Asset mapping for jobs in the definition.
+            timeout: Time in seconds to wait for a result.
+            project_id: Workflow project ID.
+
+        Returns:
+            Completed workflow resource.
+        """
+        project_id = self._client.project_id(project_id)
+        payload = asdict(definition=definition, parameters=parameters, assets=assets)
+        r: Response = self._client.post(f"/projects/{project_id}/workflows", json=payload)
+        url = r.json()["link"]
+        try:
+            r = self._client.poll(url, timeout)
+        except PollTimeout as e:
+            raise RuntimeError(
+                f"Workflow failed to complete within {timeout} seconds"
+            ) from e
+        return Workflow(**r.json())
+
+    def cancel(self, workflow_id: str, project_id: Optional[str] = None) -> Workflow:
+        """Cancel a running workflow.
+
+        Args:
+            workflow_id: ID of workflow to cancel.
+            project_id: Workflow project ID.
+
+        Returns:
+            Workflow resource.
+        """
+        project_id = self._client.project_id(project_id)
+        url = f"/projects/{project_id}/workflows/{workflow_id}/cancel"
+        r: Response = self._client.post(url)
+        return Workflow(**r.json())
+
+    def delete(self, workflow_id: str, project_id: Optional[str] = None):
+        """Delete a workflow.
+
+        Args:
+            workflow_id: ID of workflow to delete.
+            project_id: Workflow project ID.
+        """
+        project_id = self._client.project_id(project_id)
+        url = f"/projects/{project_id}/workflows/{workflow_id}"
+        self._client.delete(url)

{metafold-0.7.0 → metafold-0.8.dev1}/metafold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: metafold
-Version: 0.7.0
+Version: 0.8.dev1
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.7.0 → metafold-0.8.dev1}/metafold.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ metafold/jobs.py
 metafold/nx.py
 metafold/projects.py
 metafold/utils.py
+metafold/workflows.py
 metafold.egg-info/PKG-INFO
 metafold.egg-info/SOURCES.txt
 metafold.egg-info/dependency_links.txt
@@ -22,4 +23,5 @@ tests/test_assets.py
 tests/test_func.py
 tests/test_jobs.py
 tests/test_projects.py
-tests/test_utils.py
+tests/test_utils.py
+tests/test_workflows.py

{metafold-0.7.0 → metafold-0.8.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "metafold"
-version = "0.7.0"
+version = "0.8.dev1"
 authors = [
     {name = "Metafold 3D", email = "info@metafold3d.com"},
 ]

{metafold-0.7.0 → metafold-0.8.dev1}/tests/test_assets.py

@@ -171,19 +171,6 @@ def test_create_asset(client):
     )
 
 
-def test_update_asset(client):
-    with open(test_file, "rb") as f:
-        a = client.assets.update("1", f)
-    assert a == Asset(
-        id="1",
-        filename="test.png",
-        size=67,
-        checksum="sha256:089ad5bf4831b6758e9907db43bc5ebba2e9248a9929dad6132c49932e538278",
-        created=default_dt,
-        modified=default_dt,
-    )
-
-
 def test_delete_asset(client):
     # FIXME: Assert something
     client.assets.delete("1")

{metafold-0.7.0 → metafold-0.8.dev1}/tests/test_jobs.py

@@ -3,13 +3,18 @@ from datetime import datetime, timezone
 from http import HTTPStatus
 from http.server import BaseHTTPRequestHandler
 from metafold.assets import Asset
-from metafold.jobs import Job
+from metafold.jobs import Job, IO
 from urllib.parse import parse_qs, urlparse
 import json
 import pytest
 
 default_dt = datetime(2024, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
 
+default_params = {
+    "foo": "...",
+    "bar": "...",
+}
+
 asset_json = {
     "id": "1",
     "filename": "f763df409e79eb1c.bin",
@@ -34,36 +39,57 @@ job_list = [
         "id": "3",
         "name": "bar",
         "type": "evaluate_graph",
-        "parameters": {
-            "graph": None,
-        },
-        "created": "Mon, 01 Jan 2024 00:00:00 GMT",
         "state": "success",
-        "assets": [asset_json],
+        "created": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "started": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "finished": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "error": None,
+        "inputs": {
+            "params": default_params,
+        },
+        "outputs": {
+            "params": None,
+        },
+        "needs": [],
+        "parameters": default_params,
         "meta": None,
     },
     {
         "id": "2",
         "name": "foo",
         "type": "evaluate_graph",
-        "parameters": {
-            "graph": None,
-        },
-        "created": "Mon, 01 Jan 2024 00:00:00 GMT",
         "state": "success",
-        "assets": [asset_json],
+        "created": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "started": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "finished": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "error": None,
+        "inputs": {
+            "params": default_params,
+        },
+        "outputs": {
+            "params": None,
+        },
+        "needs": [],
+        "parameters": default_params,
         "meta": None,
     },
     {
         "id": "1",
         "name": "foo",
         "type": "evaluate_graph",
-        "parameters": {
-            "graph": None,
-        },
-        "created": "Mon, 01 Jan 2024 00:00:00 GMT",
         "state": "success",
-        "assets": [asset_json],
+        "created": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "started": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "finished": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "error": None,
+        "inputs": {
+            "params": default_params,
+        },
+        "outputs": {
+            "params": None,
+        },
+        "needs": [],
+        "parameters": default_params,
         "meta": None,
     },
 ]
@@ -72,13 +98,27 @@ new_job = {
     "id": "1",
     "name": "My Job",
     "type": "test_job",
+    "created": "Mon, 01 Jan 2024 00:00:00 GMT",
+    "started": "Mon, 01 Jan 2024 00:00:00 GMT",
+    "finished": "Mon, 01 Jan 2024 00:00:00 GMT",
+    "error": None,
+    "inputs": {
+        "params": {
+            "foo": "1",
+            "bar": "a",
+            "baz": "[2, \"b\"]",
+        },
+    },
+    "outputs": {
+        "params": None,
+    },
+    "needs": [],
+    "assets": [],
     "parameters": {
-        "foo": 1,
+        "foo": "1",
         "bar": "a",
-        "baz": [2, "b"],
+        "baz": "[2, \"b\"]",
     },
-    "created": "Mon, 01 Jan 2024 00:00:00 GMT",
-    "assets": [],
     "meta": None,
 }
 
@@ -103,7 +143,8 @@ class MockRequestHandler(BaseHTTPRequestHandler):
             self.send_response(HTTPStatus.OK)
             self.send_header("Content-Type", "application/json")
             self.end_headers()
-            payload = job_list[-1]
+            payload = deepcopy(job_list[-1])
+            payload["assets"] = [asset_json]
             self.wfile.write(json.dumps(payload).encode())
         elif u.path == "/projects/1/jobs/1/status":
             global poll_count
@@ -145,7 +186,10 @@ class MockRequestHandler(BaseHTTPRequestHandler):
             self.send_header("Content-Type", "application/json")
             self.end_headers()
             payload = deepcopy(job_list[-1])
-            payload["name"] = "baz"
+            payload.update({
+                "name": "baz",
+                "assets": [asset_json],
+            })
             self.wfile.write(json.dumps(payload).encode())
         else:
             self.send_error(HTTPStatus.NOT_FOUND)
@@ -177,40 +221,49 @@ def test_get_job(client):
         id="1",
         name="foo",
         type="evaluate_graph",
-        parameters={
-            "graph": None,
-        },
-        created=default_dt,
         state="success",
+        created=default_dt,
+        started=default_dt,
+        finished=default_dt,
+        error=None,
+        inputs=IO(params=default_params),
+        outputs=IO(),
+        needs=[],
         assets=[asset_obj],
+        parameters=default_params,
         meta=None,
     )
 
 
 def test_run_job(client):
     params = {
-        "foo": 1,
+        "foo": "1",
         "bar": "a",
-        "baz": [2, "b"],
+        "baz": "[2, \"b\"]",
     }
     j = client.jobs.run("test_job", params, name="My Job")
     assert j == Job(
         id="1",
         name="My Job",
         type="test_job",
-        parameters=params,
-        created=default_dt,
         state="success",
+        created=default_dt,
+        started=default_dt,
+        finished=default_dt,
+        inputs=IO(params=params),
+        outputs=IO(),
+        needs=[],
         assets=[asset_obj],
+        parameters=params,
         meta=None,
     )
 
 
 def test_poll_job(client):
     params = {
-        "foo": 1,
+        "foo": "1",
         "bar": "a",
-        "baz": [2, "b"],
+        "baz": "[2, \"b\"]",
     }
     url = client.jobs.run_status("test_job", params, name="My Job")
     assert url == "http://localhost:8000/projects/1/jobs/1/status"
@@ -220,10 +273,15 @@ def test_poll_job(client):
         id="1",
         name="My Job",
         type="test_job",
-        parameters=params,
-        created=default_dt,
         state="success",
+        created=default_dt,
+        started=default_dt,
+        finished=default_dt,
+        inputs=IO(params=params),
+        outputs=IO(),
+        needs=[],
         assets=[asset_obj],
+        parameters=params,
         meta=None,
     )
 

{metafold-0.7.0 → metafold-0.8.dev1}/tests/test_utils.py

@@ -12,42 +12,21 @@ def test_xform():
     ], atol=1.0e-7)
 
     m = xform(
-        [1.0, 2.0, 3.0],      # T
-        [180.0, -90.0, 0.0])  # R
+        rotation=[180.0, -90.0, 0.0])  # R
     assert_allclose(m, [
         [0.0,  0.0, 1.0, 0.0],
         [0.0, -1.0, 0.0, 0.0],
         [1.0,  0.0, 0.0, 0.0],
-        [1.0,  2.0, 3.0, 1.0],
-    ], atol=1.0e-7)
-
-    m = xform(
-        [1.0, 2.0, 3.0],        # T
-        scale=[2.0, 1.0, 1.0])  # S
-    assert_allclose(m, [
-        [2.0, 0.0, 0.0, 0.0],
-        [0.0, 1.0, 0.0, 0.0],
-        [0.0, 0.0, 1.0, 0.0],
-        [1.0, 2.0, 3.0, 1.0],
-    ], atol=1.0e-7)
-
-    m = xform(
-        rotation=[180.0, -90.0, 0.0],  # R
-        scale=[2.0, 1.0, 1.0])         # S
-    assert_allclose(m, [
-        [0.0,  0.0, 2.0, 0.0],
-        [0.0, -1.0, 0.0, 0.0],
-        [1.0,  0.0, 0.0, 0.0],
         [0.0,  0.0, 0.0, 1.0],
     ], atol=1.0e-7)
 
     m = xform(
         [1.0, 2.0, 3.0],      # T
-        [180.0, -90.0, 0.0],  # R
-        [2.0, 1.0, 1.0])      # S
+        [180.0, -90.0, 0.0])  # R
     assert_allclose(m, [
-        [0.0,  0.0, 2.0, 0.0],
+        [0.0,  0.0, 1.0, 0.0],
         [0.0, -1.0, 0.0, 0.0],
         [1.0,  0.0, 0.0, 0.0],
         [1.0,  2.0, 3.0, 1.0],
     ], atol=1.0e-7)
+

metafold-0.8.dev1/tests/test_workflows.py

@@ -0,0 +1,151 @@
+from copy import deepcopy
+from datetime import datetime, timezone
+from http import HTTPStatus
+from http.server import BaseHTTPRequestHandler
+from metafold.workflows import Workflow
+from urllib.parse import parse_qs, urlparse
+import json
+import pytest
+
+default_dt = datetime(2024, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
+
+# Default sort order is descending by id
+workflow_list = [
+    {
+        "id": "3",
+        "jobs": ["1", "2"],
+        "state": "success",
+        "created": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "started": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "finished": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "definition": "...",
+    },
+    {
+        "id": "2",
+        "jobs": ["1", "2"],
+        "state": "started",
+        "created": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "started": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "finished": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "definition": "...",
+    },
+    {
+        "id": "1",
+        "jobs": ["1", "2"],
+        "state": "success",
+        "created": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "started": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "finished": "Mon, 01 Jan 2024 00:00:00 GMT",
+        "definition": "...",
+    },
+]
+
+new_workflow = {
+    "id": "1",
+    "jobs": ["1", "2"],
+    "created": "Mon, 01 Jan 2024 00:00:00 GMT",
+    "started": "Mon, 01 Jan 2024 00:00:00 GMT",
+    "finished": "Mon, 01 Jan 2024 00:00:00 GMT",
+    "definition": "foo",
+}
+
+poll_count: int = 0
+
+
+class MockRequestHandler(BaseHTTPRequestHandler):
+    def do_GET(self):
+        u = urlparse(self.path)
+        params = parse_qs(u.query)
+        if u.path == "/projects/1/workflows":
+            self.send_response(HTTPStatus.OK)
+            self.send_header("Content-Type", "application/json")
+            self.end_headers()
+            payload = workflow_list
+            if params.get("sort") == ["id:1"]:
+                payload = sorted(workflow_list, key=lambda p: p["id"])
+            elif params.get("q") == ["state:started"]:
+                payload = [p for p in workflow_list if p["state"] == "started"]
+            self.wfile.write(json.dumps(payload).encode())
+        elif u.path == "/projects/1/workflows/1":
+            self.send_response(HTTPStatus.OK)
+            self.send_header("Content-Type", "application/json")
+            self.end_headers()
+            payload = deepcopy(workflow_list[-1])
+            self.wfile.write(json.dumps(payload).encode())
+        elif u.path == "/projects/1/workflows/1/status":
+            global poll_count
+            poll_count += 1
+            if poll_count < 3:
+                self.send_response(HTTPStatus.ACCEPTED)
+                payload = deepcopy(new_workflow)
+                payload["state"] = "started"
+            else:
+                self.send_response(HTTPStatus.CREATED)
+                payload = deepcopy(new_workflow)
+                payload["state"] = "success"
+            self.send_header("Content-Type", "application/json")
+            self.end_headers()
+            self.wfile.write(json.dumps(payload).encode())
+        else:
+            self.send_error(HTTPStatus.NOT_FOUND)
+
+    def do_POST(self):
+        if self.path == "/projects/1/workflows":
+            self.send_response(HTTPStatus.ACCEPTED)
+            self.send_header("Content-Type", "application/json")
+            self.end_headers()
+            payload = deepcopy(new_workflow)
+            payload.update({
+                "state": "pending",
+                "link": "http://localhost:8000/projects/1/workflows/1/status",
+            })
+            self.wfile.write(json.dumps(payload).encode())
+        else:
+            self.send_error(HTTPStatus.NOT_FOUND)
+
+
+@pytest.fixture(scope="module")
+def request_handler():
+    return MockRequestHandler
+
+
+def test_list_workflows(client):
+    workflows = client.workflows.list()
+    assert [w.id for w in workflows] == ["3", "2", "1"]
+
+
+def test_list_workflows_sorted(client):
+    workflows = client.workflows.list(sort="id:1")
+    assert [w.id for w in workflows] == ["1", "2", "3"]
+
+
+def test_list_workflows_filtered(client):
+    workflows = client.workflows.list(q="state:started")
+    assert all([w.state == "started" for w in workflows])
+
+
+def test_get_workflow(client):
+    w = client.workflows.get("1")
+    assert w == Workflow(
+        id="1",
+        jobs=["1", "2"],
+        state="success",
+        created=default_dt,
+        started=default_dt,
+        finished=default_dt,
+        definition="...",
+    )
+
+
+def test_run_workflow(client):
+    definition = "foo"
+    w = client.workflows.run(definition)
+    assert w == Workflow(
+        id="1",
+        jobs=["1", "2"],
+        state="success",
+        created=default_dt,
+        started=default_dt,
+        finished=default_dt,
+        definition=definition,
+    )