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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: midpoint-cli
-Version: 1.5.0
+Version: 1.5.0.dev2
 Summary: A command line client to Midpoint Identity Management system.
 License: MIT
 License-File: LICENSE
@@ -22,11 +22,11 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: System :: Systems Administration
 Requires-Dist: prompt-toolkit (>=3.0,<4.0)
-Requires-Dist: pygments (>=2.18,<3.0)
-Requires-Dist: requests (>=2.32,<3.0)
-Requires-Dist: rich (>=13.0,<15.0)
+Requires-Dist: pygments (>=2.0,<3.0)
+Requires-Dist: requests (>=2.31,<3.0)
+Requires-Dist: rich (>=13.0,<14.0)
 Requires-Dist: unidecode (>=1.3,<2.0)
-Requires-Dist: urllib3 (>=2.3,<3.0)
+Requires-Dist: urllib3 (>=2.0,<3.0)
 Project-URL: Repository, https://gitlab.com/alcibiade/midpoint-cli
 Description-Content-Type: text/markdown
 
@@ -188,9 +188,8 @@ Available commands:
   user      Manage users.
             Subcommands:
               - users: List all users
-              - user search <term> [term ...]: Search for users (OR). Prefix term with + to make it mandatory (AND).
+              - user search <term>: Search for users by name
             Example: user search john
-            Example: user search +Engineering Doe Smith
 ```
 
 ### External configuration files (since v1.2)
@@ -278,10 +277,7 @@ midpoint> users
 # Lists all users with their details
 
 midpoint> user search john
-# Search for users matching "john" (OR across all fields)
-
-midpoint> user search +Engineering Doe Smith
-# Users in Engineering who match Doe or Smith (mandatory + optional OR)
+# Search for users matching "john"
 
 midpoint> org
 # List all organizational units
@@ -378,18 +374,13 @@ midpoint-cli -u admin -p pass -U https://localhost:8080/midpoint/ users
 #### Search for a specific user
 
 ```bash
-# Search by any field (OR: matches users containing "john" OR "jane")
-midpoint-cli user search john jane
-
-# Mandatory terms with + prefix (AND: must contain both "john" AND "doe")
-midpoint-cli user search +john +doe
+# Search by name or username
+midpoint-cli user search john
 
-# Mixed: must be in Engineering AND match Doe or Smith
-midpoint-cli user search +Engineering Doe Smith
+# Search with wildcards
+midpoint-cli user search "j*"
 ```
 
-Search terms are case-insensitive and matched as substrings against all user fields (name, full name, email, OU, etc.). Unicode characters are normalised before matching (e.g. `François` matches `francois`).
-
 #### Get user details (XML definition)
 
 ```bash

{midpoint_cli-1.5.0 → midpoint_cli-1.5.0.dev2}/README.md

@@ -156,9 +156,8 @@ Available commands:
   user      Manage users.
             Subcommands:
               - users: List all users
-              - user search <term> [term ...]: Search for users (OR). Prefix term with + to make it mandatory (AND).
+              - user search <term>: Search for users by name
             Example: user search john
-            Example: user search +Engineering Doe Smith
 ```
 
 ### External configuration files (since v1.2)
@@ -246,10 +245,7 @@ midpoint> users
 # Lists all users with their details
 
 midpoint> user search john
-# Search for users matching "john" (OR across all fields)
-
-midpoint> user search +Engineering Doe Smith
-# Users in Engineering who match Doe or Smith (mandatory + optional OR)
+# Search for users matching "john"
 
 midpoint> org
 # List all organizational units
@@ -346,18 +342,13 @@ midpoint-cli -u admin -p pass -U https://localhost:8080/midpoint/ users
 #### Search for a specific user
 
 ```bash
-# Search by any field (OR: matches users containing "john" OR "jane")
-midpoint-cli user search john jane
-
-# Mandatory terms with + prefix (AND: must contain both "john" AND "doe")
-midpoint-cli user search +john +doe
+# Search by name or username
+midpoint-cli user search john
 
-# Mixed: must be in Engineering AND match Doe or Smith
-midpoint-cli user search +Engineering Doe Smith
+# Search with wildcards
+midpoint-cli user search "j*"
 ```
 
-Search terms are case-insensitive and matched as substrings against all user fields (name, full name, email, OU, etc.). Unicode characters are normalised before matching (e.g. `François` matches `francois`).
-
 #### Get user details (XML definition)
 
 ```bash

{midpoint_cli-1.5.0 → 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"
+version = "1.5.0.dev2"
 description = "A command line client to Midpoint Identity Management system."
 readme = "README.md"
 
@@ -38,11 +38,11 @@ midpoint-cli = 'midpoint_cli:main'
 [tool.poetry.dependencies]
 python = "^3.9.0"
 unidecode = "^1.3"
-requests = "^2.32"
-urllib3 = "^2.3"
-rich = ">=13.0,<15.0"
+requests = "^2.31"
+urllib3 = "^2.0"
+rich = "^13.0"
 prompt-toolkit = "^3.0"
-pygments = "^2.18"
+pygments = "^2.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "*"
@@ -52,9 +52,6 @@ pytest-cov = "*"
 ruff = "*"
 mypy = "*"
 
-[tool.pytest.ini_options]
-testpaths = ["test/unit"]
-
 [tool.ruff]
 target-version = "py39"
 line-length = 120

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

@@ -12,37 +12,6 @@ from midpoint_cli.prompt.configuration import compute_client_configuration
 from midpoint_cli.prompt.console import ConsoleDisplay
 
 
-def _build_commands_epilog(version: str) -> str:
-    skip = {'EOF', 'exit'}
-    commands = []
-    for name in sorted(dir(MidpointClientPrompt)):
-        if name.startswith('do_'):
-            cmd = name[3:]
-            if cmd in skip:
-                continue
-            method = getattr(MidpointClientPrompt, name)
-            doc = method.__doc__.strip().splitlines()[0] if method.__doc__ else ''
-            commands.append((cmd, doc))
-
-    if not commands:
-        return ''
-
-    width = max(len(cmd) for cmd, _ in commands) + 2
-    lines = ['', 'Available commands:']
-    for cmd, doc in commands:
-        lines.append(f'  {cmd:<{width}}{doc}')
-
-    lines += [
-        '',
-        'Server URL and credentials can also be stored in ~/.midpoint-cli.cfg,',
-        'or read from environment variables MIDPOINT_URL, MIDPOINT_USERNAME and MIDPOINT_PASSWORD.',
-        '',
-        f'Midpoint-cli version {version}, created and maintained by Yannick Kirschhoffer alcibiade@alcibiade.org',
-        '',
-    ]
-    return '\n'.join(lines)
-
-
 def main():
     logging.basicConfig(level=logging.INFO)
     logging.getLogger('urllib3.connectionpool').setLevel(logging.ERROR)
@@ -54,7 +23,25 @@ def main():
     argument_parser = ArgumentParser(
         description='An interactive Midpoint command line client.',
         formatter_class=RawTextHelpFormatter,
-        epilog=_build_commands_epilog(version),
+        epilog="""
+    Available commands:
+      get       Get an XML definition from the server from an existing OID reference.
+      put       Create/Update a server object based on an XML structure.
+      delete    Delete a server object based on its type and OID.
+
+      task      Manage server tasks.
+      resource  Manage resources on the server.
+
+      org       Manage organizations.
+      user      Manage users.
+
+    Server URL and credentials can also be stored in ~/.midpoint-cli.cfg, or read from environment variables MIDPOINT_URL,
+    MIDPOINT_USERNAME and MIDPOINT_PASSWORD.
+
+    Midpoint-cli version """
+        + version
+        + """, created and maintained by Yannick Kirschhoffer alcibiade@alcibiade.org
+    """,
     )
     argument_parser.add_argument(
         '-v', '--version', help='Set the username to authenticate this session.', action='store_true'

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

@@ -14,8 +14,6 @@ from midpoint_cli.client.objects import (
     MidpointObjectTypes,
     MidpointOrganization,
     MidpointResource,
-    MidpointRole,
-    MidpointShadow,
     MidpointTask,
     MidpointUser,
     namespaces,
@@ -82,19 +80,6 @@ class RestApiClient:
 
         return cast(str, response.content.decode())
 
-    def patch_element(self, element_class: MidpointObjectType, element_oid: str, xml_body: str) -> str:
-        assert element_class.endpoint is not None, f'Element class {element_class} has no endpoint'
-        target_url = urljoin(self.configuration.url, 'ws/rest/' + element_class.endpoint + '/' + element_oid)
-        response = self.requests_session.patch(
-            url=target_url,
-            data=xml_body,
-            headers={'Content-Type': 'application/xml'},
-            auth=(self.configuration.username, self.configuration.password),
-        )
-        if response.status_code >= 300:
-            raise MidpointServerError(f'Error {response.status_code} received from server at {target_url}')
-        return cast(str, response.content.decode())
-
     def get_elements(self, element_class: MidpointObjectType) -> Element:
         assert element_class.endpoint is not None, f'Element class {element_class} has no endpoint'
         url = urljoin(self.configuration.url, 'ws/rest/' + element_class.endpoint)
@@ -114,13 +99,6 @@ class RestApiClient:
 
         return cast(bytes, response.content)
 
-    def get_endpoint(self, path: str) -> str:
-        url = urljoin(self.configuration.url, path)
-        response = self.requests_session.get(url=url, auth=(self.configuration.username, self.configuration.password))
-        if response.status_code >= 300:
-            raise MidpointServerError(f'Server responded with status code {response.status_code} on {url}')
-        return cast(str, response.content.decode())
-
     def put_element(
         self, xml_filename: str, patch_file: Optional[str], patch_write: bool
     ) -> tuple[MidpointObjectType, str]:
@@ -218,55 +196,6 @@ class MidpointClient:
     def get_orgs(self) -> MidpointObjectList:
         return self.__get_collection(MidpointObjectTypes.ORG.value, MidpointOrganization)
 
-    def get_roles(self) -> MidpointObjectList:
-        return self.__get_collection(MidpointObjectTypes.ROLE.value, MidpointRole)
-
-    def assign_role(self, user_oid: str, role_oid: str) -> None:
-        xml_body = (
-            '<objectModification'
-            " xmlns='http://midpoint.evolveum.com/xml/ns/public/common/api-types-3'"
-            " xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'"
-            " xmlns:t='http://prism.evolveum.com/xml/ns/public/types-3'>"
-            '<itemDelta>'
-            '<t:modificationType>add</t:modificationType>'
-            '<t:path>c:assignment</t:path>'
-            '<t:value>'
-            f"<c:targetRef oid='{role_oid}' type='c:RoleType'/>"
-            '</t:value>'
-            '</itemDelta>'
-            '</objectModification>'
-        )
-        self.api_client.patch_element(MidpointObjectTypes.USER.value, user_oid, xml_body)
-
-    def unassign_role(self, user_oid: str, role_oid: str) -> None:
-        xml_body = (
-            '<objectModification'
-            " xmlns='http://midpoint.evolveum.com/xml/ns/public/common/api-types-3'"
-            " xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'"
-            " xmlns:t='http://prism.evolveum.com/xml/ns/public/types-3'>"
-            '<itemDelta>'
-            '<t:modificationType>delete</t:modificationType>'
-            '<t:path>c:assignment</t:path>'
-            '<t:value>'
-            f"<c:targetRef oid='{role_oid}' type='c:RoleType'/>"
-            '</t:value>'
-            '</itemDelta>'
-            '</objectModification>'
-        )
-        self.api_client.patch_element(MidpointObjectTypes.USER.value, user_oid, xml_body)
-
-    def get_resource(self, oid: str) -> MidpointResource:
-        return MidpointResource(self.__get_object(MidpointObjectTypes.RESOURCE.value, oid))
-
-    def get_role(self, oid: str) -> MidpointRole:
-        return MidpointRole(self.__get_object(MidpointObjectTypes.ROLE.value, oid))
-
-    def get_org(self, oid: str) -> MidpointOrganization:
-        return MidpointOrganization(self.__get_object(MidpointObjectTypes.ORG.value, oid))
-
-    def get_shadow(self, oid: str) -> MidpointShadow:
-        return MidpointShadow(self.__get_object(MidpointObjectTypes.SHADOW.value, oid))
-
     def task_action(self, task_oid: str, task_action: str, progress_monitor: ProgressMonitor) -> Optional[MidpointTask]:
         self.api_client.execute_action(MidpointObjectTypes.TASK.value, task_oid, task_action)
 
@@ -336,23 +265,3 @@ class MidpointClient:
 
     def delete(self, midpoint_type: MidpointObjectType, oid: str) -> str:
         return self.api_client.delete(midpoint_type, oid)
-
-    def get_system_info(self) -> dict[str, str]:
-        import json
-
-        raw = self.api_client.get_endpoint('actuator/info')
-        data = json.loads(raw)
-
-        info: dict[str, str] = {}
-        if 'version' in data:
-            info['Midpoint Version'] = data['version']
-        if 'build' in data:
-            info['Build'] = data['build']
-        if 'branch' in data:
-            info['Branch'] = data['branch']
-        if 'buildTimestamp' in data:
-            info['Build Timestamp'] = data['buildTimestamp']
-        if 'license' in data:
-            info['License'] = data['license']
-
-        return info

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

@@ -2,9 +2,9 @@ import itertools
 import re
 from collections import OrderedDict
 from dataclasses import dataclass
-from datetime import datetime, timezone
+from datetime import datetime
 from enum import Enum
-from typing import Callable, Optional, TypeVar
+from typing import Callable, Optional
 from xml.etree.ElementTree import Element
 
 from rich.console import Group
@@ -32,9 +32,6 @@ namespaces = {
 }
 
 
-_T = TypeVar('_T', bound='MidpointObject')
-
-
 class MidpointObject(OrderedDict):
     def get_oid(self) -> Optional[str]:
         oid = self.get('OID')
@@ -44,14 +41,6 @@ class MidpointObject(OrderedDict):
         name = self.get('Name')
         return str(name) if name is not None else None
 
-    @classmethod
-    def error_stub(cls: type[_T], oid: str) -> _T:
-        obj = cls.__new__(cls)
-        OrderedDict.__init__(obj)
-        obj['OID'] = oid
-        obj['Status'] = 'fetch error'
-        return obj
-
 
 class MidpointObjectList(list[MidpointObject]):
     def find_object(self, search_reference) -> Optional[MidpointObject]:
@@ -62,23 +51,21 @@ class MidpointObjectList(list[MidpointObject]):
         return None
 
     def filter(self, queryterms: list[str]):
-        selected_objects = MidpointObjectList()
-
-        mandatory_terms = [t[1:] for t in queryterms if t.startswith('+')]
-        optional_terms = [t for t in queryterms if not t.startswith('+')]
+        selected_users = MidpointObjectList()
 
-        for obj in self:
-            values = [unidecode(str(v)).casefold() for v in obj.values() if v is not None]
+        for user in self:
+            selected = False
 
-            mandatory_match = all(any(unidecode(term).casefold() in v for v in values) for term in mandatory_terms)
-            optional_match = not optional_terms or any(
-                unidecode(term).casefold() in v for term in optional_terms for v in values
-            )
+            for uservalue in user.values():
+                if uservalue is not None:
+                    for term in queryterms:
+                        if unidecode(term).casefold() in unidecode(uservalue).casefold():
+                            selected = True
 
-            if mandatory_match and optional_match:
-                selected_objects.append(obj)
+            if selected:
+                selected_users.append(user)
 
-        return selected_objects
+        return selected_users
 
 
 class MidpointTask(MidpointObject):
@@ -138,7 +125,7 @@ class MidpointTask(MidpointObject):
 
             actions_executed = statistics.find('c:actionsExecuted', namespaces)
 
-            for object_actions_entry in actions_executed if actions_executed is not None else []:
+            for object_actions_entry in actions_executed or []:
                 object_type = safe_get_text(object_actions_entry.find('c:objectType', namespaces))
                 operation = safe_get_text(object_actions_entry.find('c:operation', namespaces))
                 count_success = safe_get_int(object_actions_entry.find('c:totalSuccessCount', namespaces))
@@ -221,9 +208,11 @@ class MidpointTask(MidpointObject):
                 if self.get('Execution Status') in ['RUNNING', 'RUNNABLE']:
                     # Get now in matching timezone awareness
                     if start_dt.tzinfo is not None and start_dt.tzinfo.utcoffset(start_dt) is not None:
+                        from datetime import timezone
+
                         now = datetime.now(timezone.utc)
                     else:
-                        now = datetime.now(timezone.utc).replace(tzinfo=None)
+                        now = datetime.utcnow()
                     duration_seconds = (now - start_dt).total_seconds()
                     return self._format_duration(duration_seconds)
 
@@ -342,53 +331,14 @@ class MidpointUser(MidpointObject):
 
         self._all_attributes = []
 
-        for child in itertools.chain(
-            xml_entity,
-            activation if activation is not None else [],
-            extfields if extfields is not None else [],
-        ):
+        for child in itertools.chain(xml_entity, activation or [], extfields or []):
             # Check if the child has no children and contains non-empty text
             if len(child) == 0 and (child.text is not None and child.text.strip()):
                 self._all_attributes.append((self.strip_namespace(child.tag), child.text))
 
-        self._role_assignment_oids: list[str] = []
-        self._role_assignment_id_map: dict[str, str] = {}
-        self._org_assignment_oids: list[str] = []
-        for assignment in xml_entity.findall('c:assignment', namespaces):
-            target_ref = assignment.find('c:targetRef', namespaces)
-            if target_ref is not None:
-                ref_oid = target_ref.attrib.get('oid')
-                ref_type = target_ref.attrib.get('type', '')
-                if ref_oid:
-                    if 'RoleType' in ref_type:
-                        self._role_assignment_oids.append(ref_oid)
-                        assignment_id = assignment.attrib.get('id')
-                        if assignment_id:
-                            self._role_assignment_id_map[ref_oid] = assignment_id
-                    elif 'OrgType' in ref_type:
-                        self._org_assignment_oids.append(ref_oid)
-
-        self._link_ref_oids: list[str] = []
-        for link_ref in xml_entity.findall('c:linkRef', namespaces):
-            ref_oid = link_ref.attrib.get('oid')
-            if ref_oid:
-                self._link_ref_oids.append(ref_oid)
-
     def get_all_attributes(self):
         return self._all_attributes
 
-    def get_role_assignment_oids(self) -> list[str]:
-        return self._role_assignment_oids
-
-    def get_role_assignment_id(self, role_oid: str) -> Optional[str]:
-        return self._role_assignment_id_map.get(role_oid)
-
-    def get_org_assignment_oids(self) -> list[str]:
-        return self._org_assignment_oids
-
-    def get_link_ref_oids(self) -> list[str]:
-        return self._link_ref_oids
-
 
 class MidpointOrganization(MidpointObject):
     def __init__(self, xml_entity: Element):
@@ -401,28 +351,6 @@ class MidpointOrganization(MidpointObject):
         self['Parent'] = None if parentorg is None else parentorg.attrib['oid']
 
 
-class MidpointRole(MidpointObject):
-    def __init__(self, xml_entity: Element):
-        super().__init__()
-        self['OID'] = xml_entity.attrib['oid']
-        self['Name'] = safe_get_text(xml_entity.find('c:name', namespaces))
-        self['DisplayName'] = optional_text(xml_entity.find('c:displayName', namespaces))
-        self['Description'] = optional_text(xml_entity.find('c:description', namespaces))
-        self['Status'] = safe_get_text(xml_entity.find('c:activation/c:effectiveStatus', namespaces))
-
-
-class MidpointShadow(MidpointObject):
-    def __init__(self, xml_entity: Element):
-        super().__init__()
-        self['OID'] = xml_entity.attrib['oid']
-        self['Name'] = safe_get_text(xml_entity.find('c:name', namespaces))
-        resource_ref = xml_entity.find('c:resourceRef', namespaces)
-        self['ResourceOID'] = resource_ref.attrib['oid'] if resource_ref is not None else None
-        self['Kind'] = optional_text(xml_entity.find('c:kind', namespaces))
-        self['Intent'] = optional_text(xml_entity.find('c:intent', namespaces))
-        self['Status'] = safe_get_text(xml_entity.find('c:activation/c:effectiveStatus', namespaces))
-
-
 @dataclass
 class MidpointObjectType:
     object_type: Optional[str]
@@ -524,7 +452,9 @@ class MidpointObjectTypes(Enum):
                     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}')
+        raise MidpointTypeNotFound(
+            f'No type found for value "{name}". Valid types are: {valid_types_str}'
+        )
 
 
 def optional_text(node: Optional[Element]) -> Optional[str]:

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

@@ -14,11 +14,9 @@ from midpoint_cli.client.objects import MidpointObjectList
 from midpoint_cli.prompt.console import get_console, print_error
 from midpoint_cli.prompt.delete import DeleteClientPrompt
 from midpoint_cli.prompt.get import GetClientPrompt
-from midpoint_cli.prompt.info import InfoClientPrompt
 from midpoint_cli.prompt.org import OrgClientPrompt
 from midpoint_cli.prompt.put import PutClientPrompt
 from midpoint_cli.prompt.resource import ResourceClientPrompt
-from midpoint_cli.prompt.role import RoleClientPrompt
 from midpoint_cli.prompt.script import ScriptClientPrompt
 from midpoint_cli.prompt.task import TaskClientPrompt
 from midpoint_cli.prompt.user import UserClientPrompt
@@ -32,7 +30,6 @@ class MidpointCompleter(Completer):
         self.commands = {
             'exit': 'Exit the shell',
             'help': 'Show help',
-            'info': 'Show server information',
             'get': 'Get a server object',
             'put': 'Create/Update a server object',
             'delete': 'Delete a server object',
@@ -44,31 +41,24 @@ class MidpointCompleter(Completer):
             'users': 'List all server users',
             'org': 'Manage organizations',
             'orgs': 'List all server organizations',
-            'role': 'Manage roles',
-            'roles': 'List all server roles',
             'script': 'Execute server-side scripts',
         }
 
         # Subcommands for each main command
         self.subcommands = {
             'task': ['ls', 'get', 'run', 'wait', 'suspend', 'resume'],
-            'user': ['ls', 'search', 'get', 'assign', 'unassign'],
+            'user': ['ls', 'search', 'get'],
             'org': ['ls', 'search'],
-            'role': ['ls', 'search'],
             'resource': ['ls', 'test'],
         }
 
         # Client for dynamic completions
         self.client = client
 
-        # Cache for task/user/role lists (to avoid repeated API calls)
+        # Cache for task list (to avoid repeated API calls)
         self._task_cache: Optional[MidpointObjectList] = None
         self._task_cache_time: float = 0.0
         self._task_cache_ttl = 5  # Cache for 5 seconds
-        self._user_cache: Optional[MidpointObjectList] = None
-        self._user_cache_time: float = 0.0
-        self._role_cache: Optional[MidpointObjectList] = None
-        self._role_cache_time: float = 0.0
 
     def _get_tasks(self):
         """Get tasks with caching to avoid repeated API calls."""
@@ -90,40 +80,6 @@ class MidpointCompleter(Completer):
             # If fetching fails, return empty list (don't break autocomplete)
             return []
 
-    def _get_users(self):
-        """Get users with caching to avoid repeated API calls."""
-        if self.client is None:
-            return []
-
-        current_time = time.time()
-        if self._user_cache is not None and (current_time - self._user_cache_time) < self._task_cache_ttl:
-            return self._user_cache
-
-        try:
-            users = self.client.get_users()
-            self._user_cache = users
-            self._user_cache_time = current_time
-            return users
-        except Exception:
-            return []
-
-    def _get_roles(self):
-        """Get roles with caching to avoid repeated API calls."""
-        if self.client is None:
-            return []
-
-        current_time = time.time()
-        if self._role_cache is not None and (current_time - self._role_cache_time) < self._task_cache_ttl:
-            return self._role_cache
-
-        try:
-            roles = self.client.get_roles()
-            self._role_cache = roles
-            self._role_cache_time = current_time
-            return roles
-        except Exception:
-            return []
-
     def get_completions(self, document, complete_event):
         text_before_cursor = document.text_before_cursor
         words = text_before_cursor.split()
@@ -146,32 +102,6 @@ class MidpointCompleter(Completer):
                         if subcmd.startswith(word.lower()):
                             yield Completion(subcmd, start_position=-len(word))
 
-                # Complete user assign/unassign arguments
-                elif main_cmd == 'user' and len(words) >= 2:
-                    subcmd = words[1]
-                    if subcmd in ['assign', 'unassign']:
-                        if text_before_cursor.endswith(' '):
-                            word = ''
-                        else:
-                            word = words[-1] if words else ''
-
-                        # Third position: complete user name
-                        if len(words) == 2 or (len(words) == 3 and not text_before_cursor.endswith(' ')):
-                            actual_word = words[2] if len(words) == 3 else ''
-                            for u in self._get_users():
-                                name = u.get_name()
-                                oid = u.get_oid()
-                                if name and actual_word.lower() in name.lower():
-                                    yield Completion(name, start_position=-len(actual_word), display_meta=f'OID: {oid}')
-                        # Fourth position: complete role name
-                        elif len(words) == 3 or (len(words) == 4 and not text_before_cursor.endswith(' ')):
-                            actual_word = words[3] if len(words) == 4 else ''
-                            for r in self._get_roles():
-                                name = r.get_name()
-                                oid = r.get_oid()
-                                if name and actual_word.lower() in name.lower():
-                                    yield Completion(name, start_position=-len(actual_word), display_meta=f'OID: {oid}')
-
                 # Complete task arguments for task subcommands
                 elif main_cmd == 'task' and len(words) >= 2:
                     subcmd = words[1]
@@ -211,9 +141,7 @@ class MidpointClientPrompt(
     ResourceClientPrompt,
     UserClientPrompt,
     OrgClientPrompt,
-    RoleClientPrompt,
     ScriptClientPrompt,
-    InfoClientPrompt,
 ):
     def __init__(self, client: MidpointClient):
         Cmd.__init__(self)

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

@@ -11,11 +11,3 @@ class PromptBase:
         self.client: MidpointClient
         self.error_code: Optional[int] = None
         self.error_message: Optional[str] = None
-
-    @staticmethod
-    def _subcommand_help(args, subparsers) -> bool:
-        """If -h/--help follows a known subcommand, print that subcommand's help and return True."""
-        if args and args[0] in subparsers and any(a in ('-h', '--help') for a in args[1:]):
-            subparsers[args[0]].print_help()
-            return True
-        return False