agilicus 1.296.2__py3-none-any.whl → 1.297.0__py3-none-any.whl

agilicus/__init__.py

@@ -64,6 +64,7 @@ def GetClient(
     auth_local_webserver=True,
     api_url=None,
     expiry=None,
+    admin=False,
 ):
 
     config = Configuration(host=api_url, ssl_ca_cert=cacert, discard_unknown_keys=True)
@@ -86,6 +87,7 @@ def GetClient(
             client_id=client_id,
             agilicus_scopes=agilicus_scopes,
             auth_local_webserver=auth_local_webserver,
+            admin=admin,
         )
         config.access_token = creds.access_token
 

agilicus/agilicus_api/api_client.py

@@ -77,7 +77,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.296.2/python'
+        self.user_agent = 'OpenAPI-Generator/1.297.0/python'
 
     def __enter__(self):
         return self

agilicus/agilicus_api/configuration.py

@@ -387,7 +387,7 @@ class Configuration(object):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 2025.07.28\n"\
-               "SDK Package Version: 1.296.2".\
+               "SDK Package Version: 1.297.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

agilicus/agilicus_api_README.md

@@ -4,7 +4,7 @@ Agilicus is API-first. Modern software is controlled by other software, is open,
 The `agilicus_api` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 2025.07.28
-- Package version: 1.296.2
+- Package version: 1.297.0
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://www.agilicus.com/api](https://www.agilicus.com/api)
 

agilicus/context.py

@@ -245,6 +245,10 @@ def output_json(ctx):
     return get_value(ctx, "output_format") == "json"
 
 
+def output_csv(ctx):
+    return get_value(ctx, "output_format") == "csv"
+
+
 def output_headers(ctx):
     return get_value(ctx, "output_headers")
 

agilicus/licensing/licenses.py

@@ -73,7 +73,7 @@ def _get_license(ctx, apiclient, license_id, **kwargs):
 
 def show_license(ctx, license_id, **kwargs):
     apiclient = context.get_apiclient_from_ctx(ctx)
-    return _get_license(ctx, apiclient, license_id, **kwargs).to_dict()
+    return _get_license(ctx, apiclient, license_id, **kwargs)
 
 
 def delete_license(ctx, license_id, **kwargs):
@@ -199,7 +199,7 @@ def get_licensed_product(product_label, product_table):
     product_tokens = product_label.split("-")
 
     if len(product_tokens) < 2:
-        return None
+        return "Standard"
     elif len(product_tokens) == 2:
         normalized_product_name = product_tokens[0]
     else:
@@ -223,6 +223,9 @@ def add_license_to_billing_sub(ctx, bsub, product_name=None, product_table_versi
 
     product_table = product_version["spec"].get("product_table")
     if not product_name:
+        if not bsub.status.product:
+            raise Exception(f"no product for subscription {bsub.metadata.id}")
+
         product_name = get_licensed_product(
             bsub.status.product.spec.label, product_table
         )

agilicus/main.py

@@ -1047,6 +1047,7 @@ def list_useful_orgs_(ctx, **kwargs):
 @cli.command(name="list-orgs")
 @click.option("--org-id", default=None)
 @click.option("--issuer", default=None)
+@click.option("--name", default=None)
 @click.option("--billing_account_id", default=None)
 @click.option("--enabled", type=bool, default=None)
 @click.option("--shard", default=None)

agilicus/orgs.py

@@ -43,7 +43,7 @@ def get_org_by_dictionary(ctx, org_id):
     return (org_dict_by_id, org_dict_by_name)
 
 
-def query(ctx, org_id=None, created_since=None, page_size=None, **kwargs):
+def query(ctx, org_id=None, created_since=None, page_size=None, name=None, **kwargs):
     token = context.get_token(ctx)
 
     org_id = get_org_from_input_or_ctx(ctx, org_id)
@@ -54,6 +54,9 @@ def query(ctx, org_id=None, created_since=None, page_size=None, **kwargs):
     if org_id:
         params["org_id"] = org_id
 
+    if name is not None:
+        params["organisation"] = name
+
     apiclient = context.get_apiclient(ctx, token)
     if kwargs.get("page_at_id", None) is not None:
         resp = get_many_entries(

agilicus/output/json.py

@@ -21,14 +21,14 @@ def json_output_default(o):
     return None
 
 
-def convert_to_json(ctx, entry):
+def convert_to_json(ctx, entry, indent=2):
     return json.dumps(
-        jsonify(ctx, entry), sort_keys=True, indent=2, default=json_output_default
+        jsonify(ctx, entry), sort_keys=True, indent=indent, default=json_output_default
     )
 
 
-def output_json(ctx, entry):
-    print(convert_to_json(ctx, entry))
+def output_json(ctx, entry, indent=2):
+    print(convert_to_json(ctx, entry, indent=indent))
 
 
 def output_json_to_file(ctx, doc, outfile):

agilicus/output/table.py

@@ -21,9 +21,11 @@ def format_date_only(date_input):
     return date_input.strftime("%Y-%m-%d")
 
 
-def date_else_identity(input_obj):
+def date_else_identity(input_obj, ctx=None):
     if isinstance(input_obj, datetime):
         return format_date(input_obj)
+    if ctx and not context.output_console(ctx):
+        return input_obj
     if isinstance(input_obj, list):
         list_as_str = ""
         for obj in input_obj:
@@ -43,11 +45,11 @@ def date_else_identity(input_obj):
     return input_obj
 
 
-def format_timestamp(input_obj):
+def format_timestamp(input_obj, ctx=None):
     return datetime.fromtimestamp(input_obj)
 
 
-def format_currency_from_cents(cents, currency=None):
+def format_currency_from_cents(cents, currency=None, ctx=None):
     currency_symbol = ""
     if currency:
         currency_symbol = numbers.get_currency_symbol(currency.upper(), locale="en")
@@ -97,8 +99,12 @@ def subtable(
     if not out_name:
         out_name = in_name
 
-    def format_fn(records):
-        return format_table(ctx, records, columns, getter=table_getter)
+    outer_ctx = ctx
+
+    def format_fn(records, ctx=None):
+        return format_table(
+            outer_ctx, records, columns, getter=table_getter, nested=True
+        )
 
     def getter(record, base_getter):
         subobject = base_getter(subobject_name)(record)
@@ -184,9 +190,9 @@ def status_column(in_name, out_name=None, **kwargs):
 def constant_if_exists(column: OutputColumn, constant, default=None):
     orig = column.format_fn
 
-    def check(val):
+    def check(val, ctx=None):
         if orig:
-            val = orig(val)
+            val = orig(val, ctx=ctx)
 
         if val:
             return constant
@@ -199,11 +205,11 @@ def constant_if_exists(column: OutputColumn, constant, default=None):
 def list_count(column: OutputColumn):
     orig = column.format_fn
 
-    def formatter(val):
+    def formatter(val, ctx=None):
         if isinstance(val, list):
             return len(val)
         if orig:
-            val = orig(val)
+            val = orig(val, ctx=ctx)
         return val
 
     column.format_fn = formatter
@@ -247,10 +253,10 @@ def expand_dict(column: OutputColumn):
 def summarize(column: OutputColumn, max_length: int):
     orig = column.format_fn
 
-    def format_list(val):
+    def format_list(val, ctx=None):
         if len(val) <= max_length:
             if orig:
-                val = orig(val)
+                val = orig(val, ctx=ctx)
             return val
 
         val = val[:max_length]
@@ -258,9 +264,9 @@ def summarize(column: OutputColumn, max_length: int):
             val = orig(val)
         return val + "[truncated]"
 
-    def formatter(val):
+    def formatter(val, ctx=None):
         if isinstance(val, list):
-            return format_list(val)
+            return format_list(val, ctx=ctx)
 
         if orig:
             val = orig(val)
@@ -286,7 +292,7 @@ def short_circuit_attrgetter(item):
     return func
 
 
-def _dump_json(ctx, to_dump):
+def _dump_json(ctx, to_dump, indent=2):
     # Sometimes a compound table can be a dict at its root. When formatting as json
     # handle that case
     if not isinstance(to_dump, list):
@@ -299,13 +305,17 @@ def _dump_json(ctx, to_dump):
             for record in to_dump
         ]
 
-    return convert_to_json(ctx, to_dump_as_dict)
+    return convert_to_json(ctx, to_dump_as_dict, indent=indent)
+
+
+def output_is_formatted(ctx):
+    return context.get_value(ctx, "output_format") in ("console", "csv")
 
 
 def get_table_style(ctx):
     table_style_str = context.get_value(ctx, "output_format")
     table_style = None
-    if table_style_str and table_style_str != "console":
+    if table_style_str and not output_is_formatted(ctx):
         from prettytable import (
             DEFAULT,
             MARKDOWN,
@@ -327,7 +337,12 @@ def get_table_style(ctx):
 
 
 def format_table(
-    ctx, records, columns, getter=short_circuit_attrgetter, row_filter=None
+    ctx,
+    records,
+    columns,
+    getter=short_circuit_attrgetter,
+    row_filter=None,
+    nested=False,
 ):
     if context.output_json(ctx):
         return _dump_json(ctx, records)
@@ -338,7 +353,7 @@ def format_table(
         table.set_style(table_style)
 
     if not records:
-        return table
+        records = []
 
     if not isinstance(records, list):
         records = [records]
@@ -366,11 +381,20 @@ def format_table(
 
             out_value = "---"
             if in_value is not None:
-                out_value = column.format_fn(in_value)
+                out_value = column.format_fn(in_value, ctx=ctx)
             row.append(out_value)
 
         table.add_row(row)
     table.align = "l"
+
+    return _table_to_console(ctx, table, nested)
+
+
+def _table_to_console(ctx, table, nested):
+    if context.output_csv(ctx):
+        if nested:
+            return table.get_json_string(header=False, indent=None, default=str)
+        return table.get_csv_string()
     return table
 
 
@@ -440,7 +464,9 @@ def object_subtable(
 
     subtable_columns = [column("name"), column("value")]
 
-    def format_fn(records):
+    outer_ctx = ctx
+
+    def format_fn(records, ctx=None):
         subtable_records = []
         namer = scalar_name
         if isinstance(records, list):
@@ -459,7 +485,13 @@ def object_subtable(
                 ]
             )
 
-        return format_table(ctx, subtable_records, subtable_columns, getter=table_getter)
+        return format_table(
+            outer_ctx,
+            subtable_records,
+            subtable_columns,
+            getter=table_getter,
+            nested=True,
+        )
 
     def getter(record, base_getter):
         subobject = base_getter(subobject_name)(record)

{agilicus-1.296.2.dist-info → agilicus-1.297.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agilicus
-Version: 1.296.2
+Version: 1.297.0
 Summary: Agilicus SDK
 Home-page: https://www.agilicus.com/
 License: MIT

{agilicus-1.296.2.dist-info → agilicus-1.297.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ agilicus/.gitignore,sha256=TyHq6BCuVrFiqgUb1QAayLxWcBseKwEOoKJTQb_-iW8,5
 agilicus/.openapi-generator/FILES,sha256=627nT8VSdcWyv-WHsLvgw9fe1lTSpaHBusxZrwVOPHQ,126159
 agilicus/.openapi-generator/VERSION,sha256=LXsIFraL1muXBEww1sZWaewc9ji87Ih3gIa04Z37RYM,14
 agilicus/.openapi-generator-ignore,sha256=pu2PTide7pJtJ-DFLzDy0cTYQJRlrB-8RRH3zGLeUds,1040
-agilicus/__init__.py,sha256=Qxd9iQtVIZzzogmw8JjNvA6nSbgUJ22sAK-ibvB4hg8,4095
+agilicus/__init__.py,sha256=wKcHA5i7adxUCWhmNwq5bn10OXInnp7vJvbK8UVpKt4,4137
 agilicus/access.py,sha256=UEHHhE3cCaCjxXQDjhKxQAoUEMWandygN0d-yEIIf8A,5457
 agilicus/admin.py,sha256=rPXaddSiGpq3MBMQyFagy2RAHPhZkKN8ZGkMuN-MZqg,9991
 agilicus/agilicus_api/__init__.py,sha256=pL-bPYbnJoFEugUDt05_ViJP7_cQ7lcyPjhJKaz1BWI,71326
@@ -73,9 +73,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=fqDJg9_ViIRLGfqLIG17mBw1za-dAtfwAl
 agilicus/agilicus_api/api/users_api_mock.py,sha256=GP0l1NcvX0ynOiZhRtuArS4D7lviWYADG_5KZNSNY-s,18930
 agilicus/agilicus_api/api/whoami_api.py,sha256=ljHaQGYYuuz6XWELsXPCbOCFu28ho7N5ELDNflfDbd4,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=Fj7tO3r9l-MCUrGrXvAN-xfRT96pO9IZYBnsrTKTfA4,38845
+agilicus/agilicus_api/api_client.py,sha256=iB0Vv0wBQq3TAurjiVsD757g21PeavP-09ZxpTzncg0,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=ijG84bKeWq8lCvqXBtmWXrEnDMfw2t5qu5nQwgAyckU,2280
-agilicus/agilicus_api/configuration.py,sha256=8YH9FFwD36XksAJ3oZdnumLVqWi5VLyevo4PMmTjyWI,18447
+agilicus/agilicus_api/configuration.py,sha256=vh-I1wYuSpigozWIslDchY3KVJioF0uali54EWhA5iw,18447
 agilicus/agilicus_api/docs/APIKey.md,sha256=4cKuz4_l9HcEDnUrLwYbEnn9C2WoDayrjfrY1Ixgaf4,1747
 agilicus/agilicus_api/docs/APIKeyIntrospect.md,sha256=nJ-zkuFm3JMbWFDYYN_vYyQk1snGBtBvIxtCQxamhAU,1019
 agilicus/agilicus_api/docs/APIKeyIntrospectAuthorizationInfo.md,sha256=7RApOOLjvWQs5sw2jb25g7i3Kta1BiEY-s8VRXfppH8,725
@@ -2797,7 +2797,7 @@ agilicus/agilicus_api/test/test_x509_root_certificate.py,sha256=Brl5wKCrtt3cZmT6
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=p3AIJK4qqp3kbOkDrh9E5DeNbK9lLTxaF-0tefvcjxA,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=lm1qjvnwOJbxN01TLmXKAZFmTgF0nczcJjhW7o19OTs,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=yxg0br0SByreMUAWxTB-PMPqcdAd8kjkJmVoQwFQjnQ,2746
-agilicus/agilicus_api_README.md,sha256=DNISPI8zx6rs2IJMihjnQoPGZRiJcvQg8cUSwk4Dngs,179388
+agilicus/agilicus_api_README.md,sha256=mM5x9SsEIXXTF8c-1EeAdpWzuoSTvVNV0cNq4n_KO88,179388
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=Mdc_pRXyfa-IvIFH7gNbx0Ob64gUHggZyeSyLUDpjMs,54048
@@ -2812,7 +2812,7 @@ agilicus/client_secrets.json,sha256=eyPFVzziH48RuwWl66cfi0JE4jpmoec0Vo_F2TzYOeI,
 agilicus/command_helpers/__init__.py,sha256=6oUAOlb7IC_UfBgK3EmWVSIxKR546rjm3A2a2IEc-6s,67
 agilicus/command_helpers/command_wrapper.py,sha256=_oZeSe6ZllrD6Ij731xX_yZ8l6gruMOcodmZ-uZg2Z8,1099
 agilicus/connectors.py,sha256=gp1WqYUHtiWUJJMw7_iA0pdXCJVp76BBrpTX1UntVGc,44839
-agilicus/context.py,sha256=uBcrU61FoOrzfL6t2LaRsadfz8VWbjeFsT6EaRBk3sE,8362
+agilicus/context.py,sha256=NzTnWZ7OAcpYgPDMxLiBFvFir84jabTirpc1haQdJ_c,8437
 agilicus/create.py,sha256=ndMbOxQasyyUY7aW4U2TU8EKGcUla72xCjAwAwfTBVA,3270
 agilicus/credentials.py,sha256=F3yPAwoMcziP1OLmzeJ8jIz1W-91-HXu4zcymyMp1E4,4730
 agilicus/credentials_commands/credentials.py,sha256=YduI2SJR8nJgFuAloNowy16_s-rdVLZLDkuQvk_YmAg,3574
@@ -2853,22 +2853,22 @@ agilicus/labels/labels_main.py,sha256=l2z_41X3sMJoSM483LmAzJE6bKKHVAEvrPjfz7QvFg
 agilicus/launchers.py,sha256=r4nctnVtfP-Ho_HXEfAiMaMqJI0u7pbieHSS3Vd0QBE,11361
 agilicus/licensing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agilicus/licensing/formatters.py,sha256=oZAey_PTD8ywy8ujhgsOTcMcIRnIkVqgNFBEJhViyxE,608
-agilicus/licensing/licenses.py,sha256=Yt1z04lk8zbfXUOD8QIPUJ1NjKUuPivhDftQ7mzNHoI,7045
+agilicus/licensing/licenses.py,sha256=Xxb9rThz5qrUHP-oV3lPfRwuYloIynaxPXXQopElPto,7157
 agilicus/licensing/licensing_main.py,sha256=go1GCWK3evgpwsA2TnHLZgi7joGG2s1vwKX3gYq_QaU,5481
 agilicus/licensing/product_table_versions.py,sha256=Zk8L--z8wu6DPnbtYMGifc2J2KdNtnTBgyJv-CRAbr8,3038
 agilicus/logs.py,sha256=Y4XVcLctY-2O-Q_CXbJs9sAqu0NknHKSsqilKiDM_A0,804
 agilicus/lookups.py,sha256=MNmNsKpP7Fq_poLAnL9xo_iptFilKM9ziGLyIe8VKaw,669
-agilicus/main.py,sha256=pt_iGryVQ3jGMSxmOAtNcrTYX-I-kQn_i6Y_rVDoNyI,295610
+agilicus/main.py,sha256=yJ9EVNWT4xt9OMpVOm-pAGui3REzYKBOi3ceoonJnTg,295648
 agilicus/messages/__init__.py,sha256=cVqfaKUndO-AYfppkdFICM5WvYFFB1hRjXihFWmiGPQ,174
 agilicus/messages/messages.py,sha256=b2eO6BaWI9UZTLETcdy1NotyuNlKIJf6CS_TUzehuk4,9175
 agilicus/messages/messages_main.py,sha256=A0xucYwwUZFIuUc0bAyAqVwofErakmyawq5bwhZKcOU,1598
 agilicus/metrics.py,sha256=v4rwpvqDzeNG5GKNoZ7t34X5qUgly5IW2s-kXlS2vQM,2315
-agilicus/orgs.py,sha256=cmGAq3nWwAec7NQwaE15RThPm6Eq4VL7iEzHQi_HnNg,16218
+agilicus/orgs.py,sha256=w4EfnQ0xtVl_LCYjfw4kF-H5C-oyc-JCfqfc89GS_iU,16293
 agilicus/output/__init__.py,sha256=UKZbHS4t15vazJuN46FN-3HHqkxMXU0p3df2VcsSLcY,110
 agilicus/output/column_builder.py,sha256=TWo4t8ygaTUv7qjD_moDroD1bKzzyTIao0FmLy5gs4o,4284
 agilicus/output/console.py,sha256=xBURxlA7H1kmQ7zIKuifs_aQJq1cvmCJ5CtQVSo3_Ns,400
-agilicus/output/json.py,sha256=-5bX7ud1hIxux4l3P-K2gJXrE2gdZ0Ua1hfUOCX9MUM,899
-agilicus/output/table.py,sha256=8UIYPtgbJdJoDaqGq3lDJTk923GUcVf1QrRtRMtiWXM,12434
+agilicus/output/json.py,sha256=eR-3gVU9yrgcmvcVVLq3L5kTSK3723gQG9kWl1qLkfA,939
+agilicus/output/table.py,sha256=_IEouTyMWsb2Whbtp8UCr_KfaHR-AIkO4t6GfI49qEA,13245
 agilicus/output/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agilicus/output/tests/column_builder_test.py,sha256=fKP4V5sqXtmEIr-Q0gWVSFdBqCUtugZkP6G5gML_T7I,2130
 agilicus/pagination/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -2905,8 +2905,8 @@ agilicus/trusted_certs/trusted_certs_main.py,sha256=6dHHWXvNIcUa_nA9ptigL4Vibe4n
 agilicus/users.py,sha256=14Q18XjNh45JUuM4uOJa8UzoVHYCi11M16oI9zPqirE,44522
 agilicus/version.py,sha256=G9OFdL1v_4dLDfk6I6taDNypM5bbO-JHAwilsu9LYgg,23
 agilicus/whoami.py,sha256=kqghtWMgZOd2rhKmfguDwCTm6A3gNS8Kj-S2IBxBtl0,206
-agilicus-1.296.2.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.296.2.dist-info/METADATA,sha256=4LmonrAzNqNKsBciQacQsxqd7vEqZgpvgYCad7wpZeI,3878
-agilicus-1.296.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-agilicus-1.296.2.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.296.2.dist-info/RECORD,,
+agilicus-1.297.0.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.297.0.dist-info/METADATA,sha256=M5sBStRFqU3P72l-p8yJ3OsJlA7OHepHUV8oa0eXYJ4,3878
+agilicus-1.297.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+agilicus-1.297.0.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.297.0.dist-info/RECORD,,