pygeai 0.6.0b13__py3-none-any.whl → 0.6.1__py3-none-any.whl

pygeai/cli/commands/organization.py

@@ -19,16 +19,12 @@ def show_help():
 
 
 def list_assistants(option_list: list):
-    organization_id = None
-    project_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization_id":
-            organization_id = option_arg
-        if option_flag.name == "project_id":
-            project_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization_id = opts.get("organization_id")
+    project_id = opts.get("project_id")
 
-        if not organization_id and project_id:
-            raise MissingRequirementException("Organization ID and Project ID are required.")
+    if not organization_id and project_id:
+        raise MissingRequirementException("Organization ID and Project ID are required.")
 
     client = PluginClient()
     result = client.list_assistants(organization_id=organization_id, project_id=project_id)
@@ -53,13 +49,9 @@ assistants_list_options = [
 
 
 def get_project_list(option_list: list):
-    detail = "summary"
-    name = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "detail":
-            detail = option_arg
-        if option_flag.name == "name":
-            name = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    detail = opts.get("detail", "summary")
+    name = opts.get("name")
 
     client = OrganizationClient()
     result = client.get_project_list(detail, name)
@@ -73,10 +65,8 @@ project_list_options = [
 
 
 def get_project_detail(option_list: list):
-    project_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    project_id = opts.get("project_id")
 
     if not project_id:
         raise MissingRequirementException("Cannot retrieve project detail without project-id")
@@ -92,41 +82,17 @@ project_detail_options = [
 
 
 def create_project(option_list: list):
-    name = None
-    email = None
-    description = None
-    subscription_type = None
-    usage_unit = None
-    soft_limit = None
-    hard_limit = None
-    renewal_status = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
+    email = opts.get("admin_email")
+    description = opts.get("description")
+    subscription_type = opts.get("subscription_type")
+    usage_unit = opts.get("usage_unit")
+    soft_limit = opts.get("soft_limit")
+    hard_limit = opts.get("hard_limit")
+    renewal_status = opts.get("renewal_status")
+    
     usage_limit = {}
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
-
-        if option_flag.name == "description":
-            description = option_arg
-
-        if option_flag.name == "admin_email":
-            email = option_arg
-
-        if option_flag.name == "subscription_type":
-            subscription_type = option_arg
-
-        if option_flag.name == "usage_unit":
-            usage_unit = option_arg
-
-        if option_flag.name == "soft_limit":
-            soft_limit = option_arg
-
-        if option_flag.name == "hard_limit":
-            hard_limit = option_arg
-
-        if option_flag.name == "renewal_status":
-            renewal_status = option_arg
-
     if subscription_type or usage_unit or soft_limit or hard_limit or renewal_status:
         usage_limit.update({
             "subscriptionType": subscription_type,
@@ -172,18 +138,10 @@ create_project_options = [
 
 
 def update_project(option_list: list):
-    project_id = None
-    name = None
-    description = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
-
-        if option_flag.name == "name":
-            name = option_arg
-
-        if option_flag.name == "description":
-            description = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    project_id = opts.get("project_id")
+    name = opts.get("name")
+    description = opts.get("description")
 
     if not (project_id and name):
         raise MissingRequirementException("Cannot update project without project-id and/or name")
@@ -201,10 +159,8 @@ update_project_options = [
 
 
 def delete_project(option_list: list):
-    project_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    project_id = opts.get("project_id")
 
     if not project_id:
         raise MissingRequirementException("Cannot delete project without project-id")
@@ -220,10 +176,8 @@ delete_project_options = [
 
 
 def get_project_tokens(option_list: list):
-    project_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    project_id = opts.get("project_id")
 
     if not project_id:
         raise MissingRequirementException("Cannot retrieve project tokens without project-id")
@@ -239,22 +193,11 @@ get_project_tokens_options = [
 
 
 def export_request_data(option_list: list):
-    assistant_name = None
-    status = None
-    skip = 0
-    count = 0
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "assistant_name":
-            assistant_name = option_arg
-
-        if option_flag.name == "status":
-            status = option_arg
-
-        if option_flag.name == "skip":
-            skip = option_arg
-
-        if option_flag.name == "count":
-            count = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    assistant_name = opts.get("assistant_name")
+    status = opts.get("status")
+    skip = opts.get("skip", 0)
+    count = opts.get("count", 0)
 
     client = OrganizationClient()
     result = client.export_request_data(assistant_name, status, skip, count)
@@ -290,26 +233,13 @@ export_request_data_options = [
 
 
 def get_memberships(option_list: list):
-    email = None
-    start_page = 1
-    page_size = 20
-    order_key = None
-    order_direction = "desc"
-    role_types = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "email":
-            email = option_arg
-        if option_flag.name == "start_page":
-            start_page = int(option_arg)
-        if option_flag.name == "page_size":
-            page_size = int(option_arg)
-        if option_flag.name == "order_key":
-            order_key = option_arg
-        if option_flag.name == "order_direction":
-            order_direction = option_arg
-        if option_flag.name == "role_types":
-            role_types = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    email = opts.get("email")
+    start_page = int(opts.get("start_page", 1))
+    page_size = int(opts.get("page_size", 20))
+    order_key = opts.get("order_key")
+    order_direction = opts.get("order_direction", "desc")
+    role_types = opts.get("role_types")
 
     client = OrganizationClient()
     result = client.get_memberships(email, start_page, page_size, order_key, order_direction, role_types)
@@ -357,26 +287,13 @@ get_memberships_options = [
 
 
 def get_project_memberships(option_list: list):
-    email = None
-    start_page = 1
-    page_size = 20
-    order_key = None
-    order_direction = "desc"
-    role_types = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "email":
-            email = option_arg
-        if option_flag.name == "start_page":
-            start_page = int(option_arg)
-        if option_flag.name == "page_size":
-            page_size = int(option_arg)
-        if option_flag.name == "order_key":
-            order_key = option_arg
-        if option_flag.name == "order_direction":
-            order_direction = option_arg
-        if option_flag.name == "role_types":
-            role_types = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    email = opts.get("email")
+    start_page = int(opts.get("start_page", 1))
+    page_size = int(opts.get("page_size", 20))
+    order_key = opts.get("order_key")
+    order_direction = opts.get("order_direction", "desc")
+    role_types = opts.get("role_types")
 
     client = OrganizationClient()
     result = client.get_project_memberships(email, start_page, page_size, order_key, order_direction, role_types)
@@ -424,54 +341,123 @@ get_project_memberships_options = [
 
 
 def get_project_roles(option_list: list):
-    project_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    project_id = opts.get("project_id")
+    start_page = int(opts.get("start_page", 1))
+    page_size = int(opts.get("page_size", 20))
+    order_key = opts.get("order_key")
+    order_direction = opts.get("order_direction", "desc")
+    role_types = opts.get("role_types")
 
     if not project_id:
         raise MissingRequirementException("Cannot retrieve project roles without project-id")
 
     client = OrganizationClient()
-    result = client.get_project_roles(project_id)
+    result = client.get_project_roles(project_id, start_page, page_size, order_key, order_direction, role_types)
     Console.write_stdout(f"Project roles: \n{result}")
 
 
 get_project_roles_options = [
     PROJECT_ID_OPTION,
+    Option(
+        "start_page",
+        ["--start-page"],
+        "Page number for pagination (default: 1)",
+        True
+    ),
+    Option(
+        "page_size",
+        ["--page-size"],
+        "Number of items per page (default: 20)",
+        True
+    ),
+    Option(
+        "order_key",
+        ["--order-key"],
+        "Field for sorting (only 'name' supported)",
+        True
+    ),
+    Option(
+        "order_direction",
+        ["--order-direction"],
+        "Sort direction: asc or desc (default: desc)",
+        True
+    ),
+    Option(
+        "role_types",
+        ["--role-types"],
+        "Comma-separated list: backend, frontend (optional, case-insensitive)",
+        True
+    ),
 ]
 
 
 def get_project_members(option_list: list):
-    project_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    project_id = opts.get("project_id")
+    start_page = int(opts.get("start_page", 1))
+    page_size = int(opts.get("page_size", 20))
+    order_key = opts.get("order_key")
+    order_direction = opts.get("order_direction", "desc")
+    role_types = opts.get("role_types")
 
     if not project_id:
         raise MissingRequirementException("Cannot retrieve project members without project-id")
 
     client = OrganizationClient()
-    result = client.get_project_members(project_id)
+    result = client.get_project_members(project_id, start_page, page_size, order_key, order_direction, role_types)
     Console.write_stdout(f"Project members: \n{result}")
 
 
 get_project_members_options = [
     PROJECT_ID_OPTION,
+    Option(
+        "start_page",
+        ["--start-page"],
+        "Page number for pagination (default: 1)",
+        True
+    ),
+    Option(
+        "page_size",
+        ["--page-size"],
+        "Number of items per page (default: 20)",
+        True
+    ),
+    Option(
+        "order_key",
+        ["--order-key"],
+        "Field for sorting (only 'name' supported)",
+        True
+    ),
+    Option(
+        "order_direction",
+        ["--order-direction"],
+        "Sort direction: asc or desc (default: desc)",
+        True
+    ),
+    Option(
+        "role_types",
+        ["--role-types"],
+        "Comma-separated list: backend, frontend (optional, case-insensitive)",
+        True
+    ),
 ]
 
 
 def get_organization_members(option_list: list):
-    organization_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization_id":
-            organization_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization_id = opts.get("organization_id")
+    start_page = int(opts.get("start_page", 1))
+    page_size = int(opts.get("page_size", 20))
+    order_key = opts.get("order_key")
+    order_direction = opts.get("order_direction", "desc")
+    role_types = opts.get("role_types")
 
     if not organization_id:
         raise MissingRequirementException("Cannot retrieve organization members without organization-id")
 
     client = OrganizationClient()
-    result = client.get_organization_members(organization_id)
+    result = client.get_organization_members(organization_id, start_page, page_size, order_key, order_direction, role_types)
     Console.write_stdout(f"Organization members: \n{result}")
 
 
@@ -482,24 +468,68 @@ get_organization_members_options = [
         "GUID of the organization (required)",
         True
     ),
+    Option(
+        "start_page",
+        ["--start-page"],
+        "Page number for pagination (default: 1)",
+        True
+    ),
+    Option(
+        "page_size",
+        ["--page-size"],
+        "Number of items per page (default: 20)",
+        True
+    ),
+    Option(
+        "order_key",
+        ["--order-key"],
+        "Field for sorting (only 'email' supported)",
+        True
+    ),
+    Option(
+        "order_direction",
+        ["--order-direction"],
+        "Sort direction: asc or desc (default: desc)",
+        True
+    ),
+    Option(
+        "role_types",
+        ["--role-types"],
+        "Comma-separated list: backend (only for organizations, case-insensitive)",
+        True
+    ),
+]
+
+
+def get_runtime_policies(option_list: list):
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization_id = opts.get("organization_id")
+
+    client = OrganizationClient()
+    result = client.get_runtime_policies(organization_id)
+    Console.write_stdout(f"Plugin runtime policies: \n{result}")
+
+
+get_runtime_policies_options = [
+    Option(
+        "organization_id",
+        ["--organization-id", "--oid"],
+        "GUID of the organization (optional, defaults to token's organization)",
+        True
+    ),
 ]
 
 
 def add_project_member(option_list: list):
-    project_id = None
-    user_email = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    project_id = opts.get("project_id")
+    user_email = opts.get("user_email")
+    batch_file = opts.get("batch_file")
+    
     roles = []
-    batch_file = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
-        if option_flag.name == "user_email":
-            user_email = option_arg
-        if option_flag.name == "roles":
-            roles = [r.strip() for r in option_arg.split(",")]
-        if option_flag.name == "batch_file":
-            batch_file = option_arg
+    roles_arg = opts.get("roles")
+    if roles_arg:
+        roles = [r.strip() for r in roles_arg.split(",")]
 
     client = OrganizationClient()
 
@@ -589,15 +619,9 @@ add_project_member_options = [
 
 
 def create_organization(option_list: list):
-    name = None
-    email = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
-
-        if option_flag.name == "admin_email":
-            email = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
+    email = opts.get("admin_email")
 
     if not (name and email):
         raise MissingRequirementException("Cannot create organization without name and administrator's email")
@@ -624,26 +648,22 @@ create_organization_options = [
 
 
 def get_organization_list(option_list: list):
+    opts = {opt.name: arg for opt, arg in option_list}
+    order_direction = opts.get("order_direction", "desc")
+    
     start_page = None
+    start_page_arg = opts.get("start_page")
+    if start_page_arg:
+        start_page = int(start_page_arg)
+    
     page_size = None
-    order_key = None
-    order_direction = "desc"
-    filter_key = None
-    filter_value = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_page":
-            start_page = int(option_arg)
-        if option_flag.name == "page_size":
-            page_size = int(option_arg)
-        if option_flag.name == "order_key":
-            order_key = option_arg
-        if option_flag.name == "order_direction":
-            order_direction = option_arg
-        if option_flag.name == "filter_key":
-            filter_key = option_arg
-        if option_flag.name == "filter_value":
-            filter_value = option_arg
+    page_size_arg = opts.get("page_size")
+    if page_size_arg:
+        page_size = int(page_size_arg)
+    
+    order_key = opts.get("order_key")
+    filter_key = opts.get("filter_key")
+    filter_value = opts.get("filter_value")
 
     client = OrganizationClient()
     result = client.get_organization_list(start_page, page_size, order_key, order_direction, filter_key, filter_value)
@@ -691,10 +711,8 @@ get_organization_list_options = [
 
 
 def delete_organization(option_list: list):
-    organization_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization_id":
-            organization_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization_id = opts.get("organization_id")
 
     if not organization_id:
         raise MissingRequirementException("Cannot delete organization without organization-id")
@@ -840,12 +858,21 @@ organization_commands = [
         [],
         get_organization_members_options
     ),
+    Command(
+        "get_runtime_policies",
+        ["get-runtime-policies"],
+        "Get runtime policies for a plugin",
+        get_runtime_policies,
+        ArgumentsEnum.OPTIONAL,
+        [],
+        get_runtime_policies_options
+    ),
     Command(
         "add_project_member",
-        ["add-project-member", "apm"],
-        "Add a user to a project by sending an invitation email",
+        ["add-project-member"],
+        "Add a member to a project (single or batch)",
         add_project_member,
-        ArgumentsEnum.REQUIRED,
+        ArgumentsEnum.OPTIONAL,
         [],
         add_project_member_options
     ),
@@ -859,9 +886,9 @@ organization_commands = [
         create_organization_options
     ),
     Command(
-        "organization_list",
-        ["list-organizations"],
-        "List organization information",
+        "get_organization_list",
+        ["get-organization-list"],
+        "Get organization list",
         get_organization_list,
         ArgumentsEnum.OPTIONAL,
         [],
@@ -870,7 +897,7 @@ organization_commands = [
     Command(
         "delete_organization",
         ["delete-organization"],
-        "Delete existing organization",
+        "Delete organization",
         delete_organization,
         ArgumentsEnum.REQUIRED,
         [],