das-cli 1.2.30__tar.gz → 1.2.31__tar.gz

{das_cli-1.2.30/das_cli.egg-info → das_cli-1.2.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.2.30
+Version: 1.2.31
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT

{das_cli-1.2.30 → das_cli-1.2.31}/das/managers/entries_manager.py

@@ -125,6 +125,9 @@ class EntryManager:
             if (entry_raw.get("lastmodificationtime") is not None):
                 entry["Updated At"] = entry_raw.get("lastmodificationtime")
 
+            if not 'attributeId' in entry:
+                entry['attributeId'] = entry_response.get('attributeId')
+
             return entry
         except Exception as e:
             raise ValueError(f"Error processing entry data: {e}")
@@ -596,25 +599,33 @@ class EntryManager:
         return self.entry_service.chown(new_user_id=user.get('id'), entry_list_ids=entry_list_ids)
 
 
-    def get_direct_relations(self, attribute_id: int, entry_id: str, query_string: str="", sorting: str = "", max_result_count: int = 100, skip_count: int = 0):
+    def get_direct_relations(self, 
+        entry_code: str = None, 
+        entry_id: str = None, 
+        query_string: str = "",
+        sorting: str = "",
+        max_result_count: int = 100,
+        skip_count: int = 0):
         """
         Get the direct relations for an entry.
         """
-        if not attribute_id:
-            raise ValueError("Attribute ID is required")
-        if not entry_id:
-            raise ValueError("Entry ID is required")
-        if not query_string:
-            raise ValueError("Query string is required")
 
-        if not sorting:
-            sorting = ""
-        if not max_result_count:
-            max_result_count = 100
-        if not skip_count:
-            skip_count = 0
+        if not entry_code and not entry_id:
+            raise ValueError("Entry code or ID is required")
+        
+        if entry_code:
+            entry = self.get(code=entry_code)
+            entry_id = entry.get('ID') if entry.get('ID') else entry.get('id')
+        else:
+            entry = self.get(id=entry_id)
+
+        if entry is None:
+            raise ValueError("Entry not found")
 
-        return self.entry_service.get_direct_relations(attribute_id=attribute_id, entry_id=entry_id, query_string=query_string, sorting=sorting, max_result_count=max_result_count, skip_count=skip_count)
+        return self.entry_service.get_direct_relations(
+            attribute_id=entry.get('attributeId'),
+            entry_id=entry.get('ID') if entry.get('ID') else entry.get('id'), 
+            query_string=query_string, sorting=sorting, max_result_count=max_result_count, skip_count=skip_count)
 
 if __name__ == "__main__":
     manager = EntryManager()

{das_cli-1.2.30 → das_cli-1.2.31/das_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.2.30
+Version: 1.2.31
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT

{das_cli-1.2.30 → das_cli-1.2.31}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "das-cli"
-version = "1.2.30"
+version = "1.2.31"
 authors = [
   { name="Royal Netherlands Institute for Sea Research" },
 ]

{das_cli-1.2.30 → das_cli-1.2.31}/tests/entries_manager_test.py

@@ -433,4 +433,12 @@ class TestEntriesManager(unittest.TestCase):
         self.assertNotIn("\"code\":", message, "Error message should not be a raw JSON string")
 
 
+    def test_get_direct_relations(self):
+        """Test getting the direct relations for an entry"""
+        direct_relations = self.entry_manager.get_direct_relations(entry_code="6.b.sy")
+        self.assertIsNotNone(direct_relations)
+        self.assertGreater(len(direct_relations), 0)
+        self.assertRegex(direct_relations.get('items')[0].get('id'), r'^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$')
+
+