Merge pull request #32 from BAMresearch/main

small fixes
SciCatProject · Nov 11, 2022 · 98fa114 · 98fa114
2 parents 448ef72 + 09cea0e
commit 98fa114
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pyscicat/client.py b/pyscicat/client.py
@@ -478,6 +478,10 @@ def datasets_get_many(self, filter_fields: Optional[dict] = None) -> Optional[di
         ```python
         filterField = {"proposalId": ""}
         ```
+        If you want to search on partial strings, you can use "like":
+        ```python
+        filterField = {"proposalId": {"like":"123"}}
+        ```
 
         Parameters
         ----------

diff --git a/pyscicat/model.py b/pyscicat/model.py
@@ -135,6 +135,7 @@ class Dataset(Ownable):
     type: DatasetType
     validationStatus: Optional[str]
     version: Optional[str]
+    scientificMetadata: Optional[Dict]
 
 
 class RawDataset(Dataset):
@@ -144,13 +145,11 @@ class RawDataset(Dataset):
 
     principalInvestigator: Optional[str]
     creationLocation: Optional[str]
-    dataFormat: str
     type: DatasetType = DatasetType.raw
     dataFormat: Optional[str]
     endTime: Optional[str]  # datetime
     sampleId: Optional[str]
     proposalId: Optional[str]
-    scientificMetadata: Optional[Dict]
 
 
 class DerivedDataset(Dataset):
@@ -163,7 +162,6 @@ class DerivedDataset(Dataset):
     usedSoftware: List[str]
     jobParameters: Optional[dict]
     jobLogData: Optional[str]
-    scientificMetadata: Optional[Dict]
     type: DatasetType = DatasetType.derived