Merge branch 'develop' into module-deps

AgnostiqHQ · Dec 11, 2023 · 90cfae9 · 90cfae9
2 parents 9483dc7 + d94bdaf
commit 90cfae9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   have consequences.
 - Pack deps, call_before, and call_after assets into one file.
 - Changed handling of tuples and sets when building the transport graph - they will be converted to electron lists as well for now
+- `qelectron_db`, `qelectron_data_exists`, `python_version`, and `covalent_version`
+   are now optional in the pydantic model definitions.
 
 ### Fixed
 

diff --git a/covalent/_shared_files/schemas/electron.py b/covalent/_shared_files/schemas/electron.py
@@ -86,7 +86,7 @@ class ElectronAssets(BaseModel):
     error: Optional[AssetSchema] = None
     stdout: Optional[AssetSchema] = None
     stderr: Optional[AssetSchema] = None
-    qelectron_db: AssetSchema
+    qelectron_db: Optional[AssetSchema] = None
 
     # user dependent assets
     hooks: AssetSchema
@@ -97,7 +97,7 @@ class ElectronMetadata(BaseModel):
     name: str
     executor: str
     executor_data: dict
-    qelectron_data_exists: bool
+    qelectron_data_exists: Optional[bool] = None
     sub_dispatch_id: Optional[str] = None
     status: StatusEnum
     start_time: Optional[datetime] = None

diff --git a/covalent/_shared_files/schemas/lattice.py b/covalent/_shared_files/schemas/lattice.py
@@ -98,8 +98,8 @@ class LatticeMetadata(BaseModel):
     executor_data: dict
     workflow_executor: str
     workflow_executor_data: dict
-    python_version: str
-    covalent_version: str
+    python_version: Optional[str] = None
+    covalent_version: Optional[str] = None
 
 
 class LatticeSchema(BaseModel):

diff --git a/covalent/_workflow/transport.py b/covalent/_workflow/transport.py
@@ -299,7 +299,7 @@ def get_node_value(self, node_key: int, value_key: str) -> Any:
         """
         return self._graph.nodes[node_key][value_key]
 
-    def set_node_value(self, node_key: int, value_key: int, value: Any) -> None:
+    def set_node_value(self, node_key: str, value_key: int, value: Any) -> None:
         """
         Set a certain value of a node. This allows for saving custom data
         in the graph nodes.

diff --git a/requirements-client.txt b/requirements-client.txt
@@ -5,6 +5,7 @@ dask[distributed]>=2022.6.0
 filelock>=3.12.2
 furl>=2.1.3
 networkx>=2.8.6
+pydantic>=2.1.1
 requests>=2.24.0
 simplejson>=3.17.6
 toml>=0.10.2