pyPreservica 2.8.1__tar.gz → 2.8.2__tar.gz

{pypreservica-2.8.1 → pypreservica-2.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyPreservica
-Version: 2.8.1
+Version: 2.8.2
 Summary: Python library for the Preservica API
 Home-page: https://pypreservica.readthedocs.io/
 Author: James Carr

{pypreservica-2.8.1 → pypreservica-2.8.2}/pyPreservica/__init__.py

@@ -18,11 +18,11 @@ from .adminAPI import AdminAPI
 from .monitorAPI import MonitorAPI, MonitorCategory, MonitorStatus, MessageStatus
 from .webHooksAPI import WebHooksAPI, TriggerType, WebHookHandler
 from .authorityAPI import AuthorityAPI, Table
-from .mdformsAPI import MetadataGroupsAPI, GroupFieldType, GroupField, Group
+from .mdformsAPI import MetadataGroupsAPI, Group, GroupField, GroupFieldType
 
 __author__ = "James Carr (drjamescarr@gmail.com)"
 
 # Version of the pyPreservica package
-__version__ = "2.8.1"
+__version__ = "2.8.2"
 
 __license__ = "Apache License Version 2.0"

{pypreservica-2.8.1 → pypreservica-2.8.2}/pyPreservica/mdformsAPI.py

@@ -9,13 +9,12 @@ licence:    Apache License 2.0
 
 """
 import xml.etree.ElementTree
-from enum import StrEnum
 from typing import Callable, List, Union, Generator
 
 from pyPreservica.common import *
 
 
-class GroupFieldType(StrEnum):
+class GroupFieldType(Enum):
     STRING = "STRING"
     LONG_STRING = "LONGSTRING"
     DATE = "DATE"
@@ -60,11 +59,12 @@ class Group:
     name: str
     description: str
     schemaUri: str
-    fields: List[GroupField] = []
+    fields: List[GroupField]
 
     def __init__(self, name: str, description: str):
         self.name = name
         self.description = description
+        self.fields = []
 
     def __str__(self):
         return (f"Group ID: {self.group_id}\n" + f"Group Name: {self.name}\n" +
@@ -114,7 +114,7 @@ def _json_from_object_(group: Group) -> dict:
 
     fields = []
     for field in group.fields:
-        f = {"id": field.field_id, "name": field.name, "type": str(field.field_type)}
+        f = {"id": field.field_id, "name": field.name, "type": str(field.field_type.value)}
         f["minOccurs"] = str(field.minOccurs)
         f["maxOccurs"] = str(field.maxOccurs)
         f["visible"] = str(field.visible)

{pypreservica-2.8.1 → pypreservica-2.8.2}/pyPreservica.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyPreservica
-Version: 2.8.1
+Version: 2.8.2
 Summary: Python library for the Preservica API
 Home-page: https://pypreservica.readthedocs.io/
 Author: James Carr

{pypreservica-2.8.1 → pypreservica-2.8.2}/setup.py

@@ -21,7 +21,7 @@ if sys.argv[-1] == 'publish':
 # This call to setup() does all the work
 setup(
     name=PKG,
-    version="2.8.1",
+    version="2.8.2",
     description="Python library for the Preservica API",
     long_description=README,
     long_description_content_type="text/markdown",

{pypreservica-2.8.1 → pypreservica-2.8.2}/tests/test_groups.py

@@ -35,9 +35,9 @@ def test_can_get_group():
 def test_can_add_group_by_object():
     client = MetadataGroupsAPI()
     group1: Group = Group("my_group_name1", "my_group_description1")
-    group1.fields.append(GroupField(field_id="attribute_1", name="Attribute 1", field_type=GroupFieldType.STRING))
-    group1.fields.append(GroupField(field_id="attribute_2", name="Attribute 2", field_type=GroupFieldType.NUMBER))
-    group1.fields.append(GroupField(field_id="attribute_3", name="Attribute 3", field_type=GroupFieldType.DATE))
+    group1.fields.append(GroupField(field_id="attribute_1", name="Attribute 1x", field_type=GroupFieldType.STRING))
+    group1.fields.append(GroupField(field_id="attribute_2", name="Attribute 2x", field_type=GroupFieldType.NUMBER))
+    group1.fields.append(GroupField(field_id="attribute_3", name="Attribute 3x", field_type=GroupFieldType.DATE))
 
     g1: dict = client.add_group(group1.name, group1.description, group1.fields)
 
@@ -46,18 +46,24 @@ def test_can_add_group_by_object():
 
     assert len(g1['fields']) == 3
 
-    client.delete_group(g1['id'])
+    group1: Group = client.group(g1['id'])
+
+    client.delete_group(group1.group_id)
 
 
 def test_can_add_new_fields_to_group():
     client = MetadataGroupsAPI()
 
-    group2: Group = Group("my_group_name11", "my_group_description11")
+    group2: Group = Group("test_group_1", "test_group_1_description")
+
+    assert len(group2.fields) == 0
 
     group2.fields.append(GroupField(field_id="attribute_11", name="Attribute 11", field_type=GroupFieldType.STRING))
     group2.fields.append(GroupField(field_id="attribute_22", name="Attribute 22", field_type=GroupFieldType.NUMBER))
     group2.fields.append(GroupField(field_id="attribute_33", name="Attribute 33", field_type=GroupFieldType.DATE))
 
+    assert len(group2.fields) == 3
+
     g2: dict = client.add_group(group2.name, group2.description, group2.fields)
 
     assert g2['name'] == group2.name