connect-cli 31.0__tar.gz → 40.0__tar.gz

{connect_cli-31.0 → connect_cli-40.0}/PKG-INFO

@@ -1,28 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: connect-cli
-Version: 31.0
+Version: 40.0
 Summary: CloudBlue Connect Command Line Interface
-Home-page: https://connect.cloudblue.com
 License: Apache-2.0
+License-File: LICENSE
 Keywords: fulfillment,command,line,interface,utility,cli,vendor,connect,cloudblue
 Author: CloudBlue LLC
-Requires-Python: >=3.8,<4
+Requires-Python: >=3.10,<4
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Utilities
 Requires-Dist: Jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
-Requires-Dist: connect-eaas-core (>=28.13,<29)
+Requires-Dist: connect-eaas-core (>=37.0)
 Requires-Dist: connect-markdown-renderer (>=3,<4)
-Requires-Dist: connect-openapi-client (>=28)
+Requires-Dist: connect-openapi-client (>=29)
 Requires-Dist: connect-reports-core (==26.*)
 Requires-Dist: fs (>=2.4.12,<3.0.0)
 Requires-Dist: interrogatio (>=2.3.1,<3.0.0)
@@ -35,8 +37,9 @@ Requires-Dist: pyyaml (>=6.0,<7.0)
 Requires-Dist: requests (>=2.25.1,<3.0.0)
 Requires-Dist: rich (>=12.4.1,<13.0.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
-Requires-Dist: uvloop (>=0.16.0,<0.17.0) ; sys_platform == "linux" or sys_platform == "darwin"
+Requires-Dist: uvloop (>=0.22.0,<0.23.0) ; sys_platform == "linux" or sys_platform == "darwin"
 Project-URL: Documentation, https://connect.cloudblue.com/community/sdk/cli/
+Project-URL: Homepage, https://connect.cloudblue.com
 Project-URL: Repository, https://github.com/cloudblue/connect-cli
 Description-Content-Type: text/markdown
 

{connect_cli-31.0 → connect_cli-40.0}/connect/.data/connect_reports/reports/billing_requests/entrypoint.py

@@ -53,8 +53,8 @@ def generate(
 
 def _get_requests(client, parameters):
     query = R()
-    query &= R().created.ge(parameters['date']['after'])
-    query &= R().created.le(parameters['date']['before'])
+    query &= R().events.created.at.ge(parameters['date']['after'])
+    query &= R().events.created.at.le(parameters['date']['before'])
 
     if parameters.get('product') and parameters['product']['all'] is False:
         query &= R().asset.product.id.oneof(parameters['product']['choices'])

{connect_cli-31.0 → connect_cli-40.0}/connect/.data/connect_reports/reports/customers_list/entrypoint.py

@@ -17,6 +17,12 @@ HEADERS = (
     'Extended Information',
 )
 
+TIER_TYPE = {
+    'customer': ['customer'],
+    'reseller': ['tier1', 'tier2'],
+}
+ALL_TYPE = {*TIER_TYPE['customer'], *TIER_TYPE['reseller']}
+
 
 def generate(
     client=None,
@@ -50,13 +56,22 @@ def generate(
 
 def _get_customers(client, parameters):
     query = R()
+    parameter_choices = set((parameters.get('tier_type', {}) or {}).get('choices', []))
 
     if parameters.get('date') and parameters['date'].get('after'):
         query &= R().events.created.at.ge(parameters['date']['after'])
         query &= R().events.created.at.le(parameters['date']['before'])
+    if parameter_choices == ALL_TYPE:
+        # In case all 3 scopes are present in parameter choices, is the same
+        # as all=True
+        parameters['tier_type']['all'] = True
     if parameters.get('tier_type') and parameters['tier_type']['all'] is False:
-        query &= R().scopes.oneof(parameters['tier_type']['choices'])
-
+        # (tier1 or tier2) and customer in choices -> all (no RLQ filter for tier_type)
+        # one or both of tier1/2 in choices -> R().type.eq('reseller')
+        # only customer in choices -> R().type.eq('customer')
+        for t_type, choices in TIER_TYPE.items():
+            if not parameter_choices.difference(choices):
+                query &= R().type.eq(t_type)
     return client.ns('tier').accounts.filter(query).order_by('-events.created.at').limit(1000)
 
 

{connect_cli-31.0 → connect_cli-40.0}/connect/.data/connect_reports/reports.json

@@ -83,6 +83,10 @@
             {
               "value": "adjustment",
               "label": "Adjustment"
+            },
+            {
+              "value": "renew",
+              "label": "Renew"
             }
           ]
         },

{connect_cli-31.0 → connect_cli-40.0}/connect/cli/plugins/product/export.py

@@ -51,6 +51,10 @@ def _build_f1_options(option_list):
     return '"{options}"'.format(options=','.join(option_list))
 
 
+def _primary_translation_str(trans):
+    return f'{trans["locale"]["id"]} ({trans["locale"]["name"]})' if trans else ''
+
+
 def _setup_cover_sheet(ws, product, location, client, media_path):
     ws.title = 'General Information'
     ws.column_dimensions['A'].width = 50
@@ -118,9 +122,8 @@ def _setup_cover_sheet(ws, product, location, client, media_path):
         .translations.filter(context__instance_id=product['id'], primary=True)
         .first()
     )
-    ws[
-        'B14'
-    ].value = f'{ primary_translation["locale"]["id"] } ({ primary_translation["locale"]["name"] })'
+
+    ws['B14'].value = _primary_translation_str(primary_translation)
 
     categories = client.categories.all()
     unassignable_cat = ['Cloud Services', 'All Categories']

{connect_cli-31.0 → connect_cli-40.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connect-cli"
-version = "31.0"
+version = "40.0"
 description = "CloudBlue Connect Command Line Interface"
 authors = ["CloudBlue LLC"]
 license = "Apache-2.0"
@@ -55,10 +55,10 @@ ccli = 'connect.cli.ccli:main'
 
 
 [tool.poetry.dependencies]
-python = ">=3.8,<4"
+python = ">=3.10,<4"
 click = "^8.1.3"
 openpyxl = "^3.0.7"
-connect-openapi-client = ">=28"
+connect-openapi-client = ">=29"
 interrogatio = "^2.3.1"
 connect-markdown-renderer = ">=3,<4"
 iso3166 = "^1.0.1"
@@ -68,10 +68,10 @@ requests = "^2.25.1"
 toml = "^0.10.2"
 Jinja2 = "^3.1.2"
 jinja2-time = "^0.2.0"
-connect-eaas-core = ">=28.13,<29"
+connect-eaas-core = ">=37.0"
 rich = "^12.4.1"
 poetry-core = "^1.3.0"  
-uvloop = { version = "^0.16.0", markers = "sys_platform == \"linux\" or sys_platform == \"darwin\"" }
+uvloop = { version = "^0.22.0", markers = "sys_platform == \"linux\" or sys_platform == \"darwin\"" }
 fs = "^2.4.12"
 pyyaml = "^6.0"