midpoint-cli 1.5.0.dev1__tar.gz → 1.5.0.dev2__tar.gz

{midpoint_cli-1.5.0.dev1 → midpoint_cli-1.5.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: midpoint-cli
-Version: 1.5.0.dev1
+Version: 1.5.0.dev2
 Summary: A command line client to Midpoint Identity Management system.
 License: MIT
 License-File: LICENSE

{midpoint_cli-1.5.0.dev1 → midpoint_cli-1.5.0.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "midpoint-cli"
-version = "1.5.0.dev1"
+version = "1.5.0.dev2"
 description = "A command line client to Midpoint Identity Management system."
 readme = "README.md"
 

{midpoint_cli-1.5.0.dev1 → midpoint_cli-1.5.0.dev2}/src/midpoint_cli/client/__init__.py

@@ -105,7 +105,7 @@ class RestApiClient:
         tree_root = self._load_xml(xml_filename)
 
         root_tag_name = tree_root.tag.split('}', 1)[1] if '}' in tree_root.tag else tree_root.tag  # strip namespace
-        object_type = MidpointObjectTypes.find_by_tagname(root_tag_name)
+        object_type = MidpointObjectTypes.find_by_name(root_tag_name)
 
         if not object_type.endpoint:
             raise MidpointUnsupportedOperation(f'Upload of {object_type} is not supported through REST API')

{midpoint_cli-1.5.0.dev1 → midpoint_cli-1.5.0.dev2}/src/midpoint_cli/client/objects.py

@@ -398,6 +398,64 @@ class MidpointObjectTypes(Enum):
     def find_by_tagname(tagname: str) -> MidpointObjectType:
         return MidpointObjectTypes.__find(tagname, lambda t: t.tagname)
 
+    @staticmethod
+    def find_by_name(name: str) -> MidpointObjectType:
+        """
+        Flexible type lookup that tries multiple matching strategies:
+        1. Case-insensitive tagname match (e.g., "objectTemplate", "ObjectTemplate")
+        2. Case-insensitive Java type match (e.g., "ObjectTemplateType")
+        3. Partial name with Type suffix appended (e.g., "ObjectTemplate" → "ObjectTemplateType")
+        4. Partial name with Type suffix removed (e.g., "ObjectTemplateType" → "ObjectTemplate")
+
+        Raises MidpointTypeNotFound with helpful suggestions if no match is found.
+        """
+        if not name:
+            raise MidpointTypeNotFound('Type name cannot be empty')
+
+        name_lower = name.lower()
+
+        # Strategy 1: Try case-insensitive tagname match
+        for mp_type in MidpointObjectTypes:
+            if mp_type.value.tagname and mp_type.value.tagname.lower() == name_lower:
+                return mp_type.value
+
+        # Strategy 2: Try case-insensitive Java type match
+        for mp_type in MidpointObjectTypes:
+            if mp_type.value.object_type and mp_type.value.object_type.lower() == name_lower:
+                return mp_type.value
+
+        # Strategy 3: Try appending "Type" suffix for partial matches
+        # (e.g., "ObjectTemplate" → "ObjectTemplateType")
+        if not name_lower.endswith('type'):
+            name_with_type = name + 'Type'
+            name_with_type_lower = name_with_type.lower()
+            for mp_type in MidpointObjectTypes:
+                if mp_type.value.object_type and mp_type.value.object_type.lower() == name_with_type_lower:
+                    return mp_type.value
+
+        # Strategy 4: Try removing "Type" suffix
+        # (e.g., "ObjectTemplateType" → "objectTemplate")
+        if name_lower.endswith('type'):
+            name_without_type = name[:-4]  # Remove "Type"
+            name_without_type_lower = name_without_type.lower()
+            for mp_type in MidpointObjectTypes:
+                if mp_type.value.tagname and mp_type.value.tagname.lower() == name_without_type_lower:
+                    return mp_type.value
+
+        # No match found - create helpful error message
+        valid_types = []
+        for mp_type in MidpointObjectTypes:
+            if mp_type.value.tagname != 'objects':  # Skip the generic "objects" type
+                if mp_type.value.object_type:
+                    valid_types.append(f'{mp_type.value.tagname} ({mp_type.value.object_type})')
+                else:
+                    valid_types.append(mp_type.value.tagname)
+
+        valid_types_str = ', '.join(sorted(valid_types))
+        raise MidpointTypeNotFound(
+            f'No type found for value "{name}". Valid types are: {valid_types_str}'
+        )
+
 
 def optional_text(node: Optional[Element]) -> Optional[str]:
     return node.text if node is not None else None

{midpoint_cli-1.5.0.dev1 → midpoint_cli-1.5.0.dev2}/src/midpoint_cli/prompt/delete.py

@@ -1,7 +1,10 @@
 import shlex
 from argparse import ArgumentParser, RawTextHelpFormatter
 
+from midpoint_cli.client import MidpointObjectTypes
+from midpoint_cli.client.objects import MidpointTypeNotFound
 from midpoint_cli.prompt.base import PromptBase
+from midpoint_cli.prompt.console import print_error
 
 delete_parser = ArgumentParser(
     formatter_class=RawTextHelpFormatter, prog='delete', description='Delete a server object.', epilog=''
@@ -21,10 +24,15 @@ class DeleteClientPrompt(PromptBase):
         try:
             delete_args = shlex.split(inp)
             ns = delete_parser.parse_args(delete_args)
-            self.client.delete(ns.objectclass, ns.oid)
 
+            # Resolve the type string to a MidpointObjectType
+            midpoint_type = MidpointObjectTypes.find_by_name(ns.objectclass)
+            self.client.delete(midpoint_type, ns.oid)
+
+        except MidpointTypeNotFound as e:
+            print_error(str(e))
         except AttributeError as e:
-            print('Error:', e)
+            print_error(str(e))
         except SystemExit:
             pass
 

{midpoint_cli-1.5.0.dev1 → midpoint_cli-1.5.0.dev2}/src/midpoint_cli/prompt/get.py

@@ -3,6 +3,7 @@ from argparse import ArgumentParser, RawTextHelpFormatter
 from xml.etree import ElementTree
 
 from midpoint_cli.client import MidpointObjectTypes
+from midpoint_cli.client.objects import MidpointTypeNotFound
 from midpoint_cli.prompt.base import PromptBase
 from midpoint_cli.prompt.console import print_error, print_xml
 
@@ -20,7 +21,7 @@ class GetClientPrompt(PromptBase):
             get_args = shlex.split(inp)
             ns = get_parser.parse_args(get_args)
 
-            midpoint_type = MidpointObjectTypes.find_by_tagname(ns.objectclass)
+            midpoint_type = MidpointObjectTypes.find_by_name(ns.objectclass)
 
             xml_text = self.client.get_xml(midpoint_type, ns.oid)
             xml_root = ElementTree.fromstring(xml_text)
@@ -38,6 +39,8 @@ class GetClientPrompt(PromptBase):
                     with open(ns.file, 'w') as f:
                         f.write(xml_text)
 
+        except MidpointTypeNotFound as e:
+            print_error(str(e))
         except AttributeError as e:
             print_error(str(e))
         except SystemExit:

{midpoint_cli-1.5.0.dev1 → midpoint_cli-1.5.0.dev2}/src/midpoint_cli/prompt/task.py

@@ -140,8 +140,7 @@ class TaskClientPrompt(PromptBase):
                                 from xml.etree import ElementTree
 
                                 failed_task_xml = self.client.api_client.get_element(
-                                    MidpointObjectTypes.TASK.value,
-                                    task_oid
+                                    MidpointObjectTypes.TASK.value, task_oid
                                 )
                                 failed_task = MidpointTask(ElementTree.fromstring(failed_task_xml))
                                 console = get_console()