bam-masterdata 0.8.0__tar.gz → 0.8.2__tar.gz

{bam_masterdata-0.8.0 → bam_masterdata-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bam-masterdata
-Version: 0.8.0
+Version: 0.8.2
 Summary: The BAM Data Store utility tools and masterdata models wrapped in a Python package with a front-end web interface.
 Author-email: BAM Data Store <datastore@bam.de>
 Maintainer-email: "Jose M. Pizarro" <jose.pizarro-blanco@bam.de>

{bam_masterdata-0.8.0 → bam_masterdata-0.8.2}/bam_masterdata/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.8.0'
-__version_tuple__ = version_tuple = (0, 8, 0)
+__version__ = version = '0.8.2'
+__version_tuple__ = version_tuple = (0, 8, 2)
 
-__commit_id__ = commit_id = 'gd5d30a411'
+__commit_id__ = commit_id = 'ge06cea03b'

{bam_masterdata-0.8.0 → bam_masterdata-0.8.2}/bam_masterdata/cli/run_parser.py

@@ -188,8 +188,30 @@ def run_parser(
                 if not collection_name
                 else f"/{space_name}/{project_name}/{collection_name}/{object_instance.code}"
             )
-            object_openbis = space.get_object(identifier)
-            object_openbis.set_props(obj_props)
+            try:
+                object_openbis = space.get_object(identifier)
+                object_openbis.set_props(obj_props)  # update properties
+            except Exception:
+                logger.info(
+                    f"Object with code {object_instance.code} does not exist in openBIS, creating new one."
+                )
+                if not collection_name:
+                    object_openbis = openbis.new_object(
+                        type=object_instance.defs.code,
+                        code=object_instance.code,
+                        space=space,
+                        project=project,
+                        props=obj_props,
+                    )
+                else:
+                    object_openbis = openbis.new_object(
+                        type=object_instance.defs.code,
+                        code=object_instance.code,
+                        space=space,
+                        project=project,
+                        collection=collection_openbis,
+                        props=obj_props,
+                    )
             object_openbis.save()
             logger.info(
                 f"Object {identifier} already exists in openBIS, updating properties."

{bam_masterdata-0.8.0 → bam_masterdata-0.8.2}/bam_masterdata/utils/users.py

@@ -63,3 +63,52 @@ class UserID:
             ):
                 return u.userId
         return None
+
+
+def get_bam_username(firstname: str, lastname: str) -> str:
+    """
+    Tries to get the BAM username from the first and last names. The BAM username guess is defined by concatenating
+    the first letter of the first name with the, max. 7 digits of the last name.
+
+    Args:
+        firstname (str): The first name.
+        lastname (str): The last name.
+
+    Returns:
+        str: The guessed BAM username.
+    """
+
+    def _de_replacements(name: str) -> str:
+        """
+        Perform common German name replacements to standardize the name.
+
+        Args:
+            name (str): Name to standardize.
+
+        Returns:
+            str: Standardized name.
+        """
+        replacements = {
+            "Ä": "Ae",
+            "Ö": "Oe",
+            "Ü": "Ue",
+            "ä": "ae",
+            "ö": "oe",
+            "ü": "ue",
+            "ß": "ss",
+        }
+        for old, new in replacements.items():
+            name = name.replace(old, new)
+        return name
+
+    # German umlaut replacements
+    firstname = _de_replacements(firstname).lower().strip()
+    lastname = _de_replacements(lastname).lower().strip()
+
+    # Defining username format
+    first_letter = firstname[0]
+    if len(lastname) > 7:
+        last_part = lastname[:7]
+    else:
+        last_part = lastname
+    return f"{first_letter}{last_part}".upper()

{bam_masterdata-0.8.0 → bam_masterdata-0.8.2}/bam_masterdata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bam-masterdata
-Version: 0.8.0
+Version: 0.8.2
 Summary: The BAM Data Store utility tools and masterdata models wrapped in a Python package with a front-end web interface.
 Author-email: BAM Data Store <datastore@bam.de>
 Maintainer-email: "Jose M. Pizarro" <jose.pizarro-blanco@bam.de>

{bam_masterdata-0.8.0 → bam_masterdata-0.8.2}/tests/conftest.py

@@ -187,7 +187,8 @@ def mock_openbis():
     # Mock users
     mock_user1 = MagicMock(firstName="John", lastName="Doe", userId="jdoe")
     mock_user2 = MagicMock(firstName="Jane", lastName="Smith", userId="jsmith")
-    mock_openbis.get_users.return_value = [mock_user1, mock_user2]
+    mock_user3 = MagicMock(firstName="Markus", lastName="Müller", userId="mmueller")
+    mock_openbis.get_users.return_value = [mock_user1, mock_user2, mock_user3]
 
     # Mock object creation with pybis
     mock_openbis._objects = []

{bam_masterdata-0.8.0 → bam_masterdata-0.8.2}/tests/utils/test_users.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 
 import pytest
 
-from bam_masterdata.utils.users import UserID
+from bam_masterdata.utils.users import UserID, get_bam_username
 
 
 class TestUserID:
@@ -41,7 +41,12 @@ class TestUserID:
 
         user_id = UserID(url="https://fake")
         assert user_id.get_userid_from_fullname("John Doe") == "jdoe"
-        assert user_id.get_userid_from_fullname("Doe, John") == "jdoe"
+        assert user_id.get_userid_from_fullname("Müller, Markus") == "mmueller"
         assert user_id.get_userid_from_fullname("Jane Smith") == "jsmith"
         assert user_id.get_userid_from_fullname("Smith, Jane") == "jsmith"
         assert user_id.get_userid_from_fullname("Unknown User") is None
+
+
+def test_get_bam_username():
+    assert get_bam_username(firstname="John", lastname="Doe") == "JDOE"
+    assert get_bam_username(firstname="Markus", lastname="Müller") == "MMUELLER"