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

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

@@ -1,28 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: connect-cli
-Version: 29.2
+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-29.2 → 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-29.2 → 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-29.2 → connect_cli-40.0}/connect/.data/connect_reports/reports.json

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

{connect_cli-29.2 → connect_cli-40.0}/connect/cli/plugins/product/clone.py

@@ -12,6 +12,7 @@ from connect.cli.plugins.product.sync import (
     GeneralSynchronizer,
     ItemSynchronizer,
     MediaSynchronizer,
+    MessageSynchronizer,
     ParamsSynchronizer,
     TemplatesSynchronizer,
 )
@@ -134,6 +135,14 @@ class ProductCloner:
                 is_clone=True,
             )
 
+            synchronizer = MessageSynchronizer(
+                self.config.active.client,
+                self.progress,
+                self.stats,
+            )
+            synchronizer.open(input_file, 'Messages')
+            synchronizer.sync()
+
             self.config.activate(self.source_account)
         except ClientError as e:
             raise ClickException(f'Error while cloning product: {str(e)}')
@@ -229,6 +238,12 @@ class ProductCloner:
                 value = '-'
             for row in range(2, ws.max_row + 1):
                 ws[f'C{row}'].value = value
+
+        ws = self.wb['Messages']
+        for row in range(2, ws.max_row + 1):
+            ws[f'A{row}'].value = ''
+            ws[f'B{row}'].value = 'create'
+
         self.wb.save(f'{self.fs.root_path}/{self.product_id}/{self.product_id}.xlsx')
 
     @staticmethod

{connect_cli-29.2 → connect_cli-40.0}/connect/cli/plugins/product/commands.py

@@ -21,6 +21,7 @@ from connect.cli.plugins.product.sync import (
     GeneralSynchronizer,
     ItemSynchronizer,
     MediaSynchronizer,
+    MessageSynchronizer,
     ParamsSynchronizer,
     StaticResourcesSynchronizer,
     TemplatesSynchronizer,
@@ -90,7 +91,7 @@ def cmd_list_products(config, query):
     help='Directory where to store the export.',
 )
 @pass_config
-def cmd_dump_products(config, product_id, output_file, output_path):
+def cmd_export_products(config, product_id, output_file, output_path):
     with console.progress() as progress:
         outfile = dump_product(
             config.active.client,
@@ -120,7 +121,7 @@ def cmd_sync_products(config, input_file):
     product_id = synchronizer.open(input_file, 'General Information')
 
     console.confirm(
-        'Are you sure you want to synchronize ' f'the product {product_id} ?',
+        f'Are you sure you want to synchronize the product {product_id} ?',
         abort=True,
     )
     console.echo('')
@@ -148,6 +149,7 @@ def cmd_sync_products(config, input_file):
             actions_sync,
             media_sync,
             config_values_sync,
+            messages_sync,
         ]
         for task in sync_tasks:
             try:
@@ -324,5 +326,12 @@ def item_sync(client, progress, input_file, stats):
     synchronizer.save(input_file)
 
 
+def messages_sync(client, progress, input_file, stats):
+    synchronizer = MessageSynchronizer(client, progress, stats)
+    synchronizer.open(input_file, 'Messages')
+    synchronizer.sync()
+    synchronizer.save(input_file)
+
+
 def get_group():
     return grp_product

{connect_cli-29.2 → 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']
@@ -174,11 +177,12 @@ def _setup_ws_header(ws, ws_type=None):  # noqa: CCR001
         elif ws_type == 'templates':
             if cel.value == 'Content':
                 ws.column_dimensions[cel.column_letter].width = 100
-            if cel.value == 'Title':
+            elif cel.value == 'Title':
                 ws.column_dimensions[cel.column_letter].width = 50
-        elif ws_type == '_attributes':
-            if cel.column_letter in ['A', 'B', 'D']:
-                ws.column_dimensions[cel.column_letter].width = 100
+        elif ws_type == '_attributes' and cel.column_letter in ['A', 'B', 'D']:
+            ws.column_dimensions[cel.column_letter].width = 100
+        elif ws_type == 'messages' and cel.column_letter == 'D':
+            ws.column_dimensions[cel.column_letter].width = 70
 
 
 def _calculate_commitment(item):
@@ -953,6 +957,42 @@ def _dump_translation_attr(wb, client, translation):
     _setup_ws_header(attr_ws, '_attributes')
 
 
+def _fill_product_message_row(ws, row_idx, msg):
+    ws.cell(row_idx, 1, value=msg['id'])
+    ws.cell(row_idx, 2, value='-')
+    ws.cell(row_idx, 3, value=msg['external_id'])
+    ws.cell(row_idx, 4, value=msg['value'])
+    ws.cell(row_idx, 5, value=msg['auto'])
+
+
+def _dump_product_messages(ws, client, product_id, progress):
+    _setup_ws_header(ws, 'messages')
+
+    row_idx = 2
+
+    messages = client.products[product_id].messages.all()
+    count = messages.count()
+
+    action_validation = DataValidation(
+        type='list',
+        formula1='"-,create,update,delete"',
+        allow_blank=False,
+    )
+
+    if count > 0:
+        ws.add_data_validation(action_validation)
+
+    task = progress.add_task('Processing message', total=count)
+
+    for msg in messages:
+        progress.update(task, description=f'Processing message {msg["id"]}', advance=1)
+        _fill_product_message_row(ws, row_idx, msg)
+        action_validation.add(f'B{row_idx}')
+        row_idx += 1
+
+    progress.update(task, completed=count)
+
+
 def dump_product(  # noqa: CCR001
     client,
     product_id,
@@ -1019,6 +1059,7 @@ def dump_product(  # noqa: CCR001
         _dump_actions(wb.create_sheet('Actions'), client, product_id, progress)
         _dump_configuration(wb.create_sheet('Configuration'), client, product_id, progress)
         _dump_translations(wb, client, product_id, progress)
+        _dump_product_messages(wb.create_sheet('Messages'), client, product_id, progress)
         wb.save(output_file)
 
     except ClientError as error:

{connect_cli-29.2 → connect_cli-40.0}/connect/cli/plugins/product/sync/__init__.py

@@ -6,6 +6,7 @@ from connect.cli.plugins.product.sync.configuration_values import (  # noqa: F40
 from connect.cli.plugins.product.sync.general import GeneralSynchronizer  # noqa: F401
 from connect.cli.plugins.product.sync.items import ItemSynchronizer  # noqa: F401
 from connect.cli.plugins.product.sync.media import MediaSynchronizer  # noqa: F401
+from connect.cli.plugins.product.sync.messages import MessageSynchronizer  # noqa: F401
 from connect.cli.plugins.product.sync.params import ParamsSynchronizer  # noqa: F401
 from connect.cli.plugins.product.sync.static_resources import (  # noqa: F401
     StaticResourcesSynchronizer,

{connect_cli-29.2 → connect_cli-40.0}/connect/cli/plugins/product/sync/items.py

@@ -135,7 +135,7 @@ class ItemSynchronizer(ProductSynchronizer):
                     field = 'ID' if data.id else 'MPN'
                     value = data.id if data.id else data.mpn
                     self._mstats.error(
-                        f'Cannot update item: item with {field} `{value}` '
+                        f'Cannot delete item: item with {field} `{value}` '
                         f'the item does not exist.',
                         row_idx,
                     )

connect_cli-40.0/connect/cli/plugins/product/sync/messages.py

@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+
+# This file is part of the Ingram Micro Cloud Blue Connect connect-cli.
+# Copyright (c) 2019-2024 Ingram Micro. All Rights Reserved.
+
+from collections import namedtuple
+
+from connect.client.rql import R
+from connect.client import ClientError, R
+
+from connect.cli.core.http import handle_http_error
+from connect.cli.plugins.shared.base import ProductSynchronizer
+from connect.cli.plugins.shared.constants import MESSAGES_HEADERS
+
+
+fields = (v.replace(' ', '_').lower() for v in MESSAGES_HEADERS.values())
+
+_RowData = namedtuple('RowData', fields)
+
+
+class MessageSynchronizer(ProductSynchronizer):
+    def __init__(self, client, progress, stats):
+        self._mstats = stats['Messages']
+        super().__init__(client, progress)
+
+    def _get_message(self, message_id):
+        try:
+            res = self._client.products[self._product_id].messages[message_id].get()
+        except ClientError as error:
+            if error.status_code == 404:
+                return
+            handle_http_error(error)
+        return res
+
+    def _create_message(self, data):
+        try:
+            payload = {'external_id': data.external_id, 'value': data.value, 'auto': data.auto}
+            res = self._client.products[self._product_id].messages.create(payload)
+        except ClientError as error:
+            handle_http_error(error)
+        return res
+
+    def _update_message(self, data):
+        try:
+            payload = {'external_id': data.external_id, 'value': data.value, 'auto': data.auto}
+            res = self._client.products[self._product_id].messages[data.id].update(payload)
+        except ClientError as error:
+            handle_http_error(error)
+        return res
+
+    def _delete_message(self, message_id):
+        try:
+            res = self._client.products[self._product_id].messages[message_id].delete()
+        except ClientError as error:
+            handle_http_error(error)
+        return res
+
+    def _process_create(self, row_idx, data, task):
+        rql = R().external_id.eq(data.external_id)
+        message = self._client.products[self._product_id].messages.filter(rql).first()
+        if message:
+            self._mstats.error(
+                f'Cannot create message: message with external_id `{data.external_id}`'
+                f' already exists with ID `{message["id"]}`.',
+                row_idx,
+            )
+        else:
+            self._progress.update(
+                task,
+                description=f'Creating message {data.external_id}',
+            )
+            try:
+                new_message = self._create_message(data)
+                self._mstats.created()
+                self._update_sheet_row(self._ws, row_idx, new_message)
+            except Exception as e:
+                self._mstats.error(str(e), row_idx)
+
+    def _process_update(self, row_idx, data, task):
+        if not self._get_message(data.id):
+            self._mstats.error(
+                f'Cannot update message: message with ID `{data.id}` ' 'does not exist.',
+                row_idx,
+            )
+        else:
+            self._progress.update(
+                task,
+                description=f'Updating message {data.id}',
+            )
+            try:
+                updated_message = self._update_message(
+                    data,
+                )
+                self._mstats.updated()
+                self._update_sheet_row(self._ws, row_idx, updated_message)
+            except Exception as e:
+                self._mstats.error(str(e), row_idx)
+
+    def _process_delete(self, row_idx, data, task):
+        if not self._get_message(data.id):
+            self._mstats.error(
+                f'Cannot delete message: message with ID `{data.id}` ' 'does not exist.',
+                row_idx,
+            )
+        else:
+            self._progress.update(
+                task,
+                description=f'Deleting message {data.id}',
+            )
+            try:
+                self._delete_message(data.id)
+                self._mstats.deleted()
+                for c in range(1, self._ws.max_column + 1):
+                    self._ws.cell(row_idx, c, value='')
+            except Exception as e:
+                self._mstats.error(str(e), row_idx)
+
+    def sync(self):  # noqa: CCR001
+        self._ws = self._wb['Messages']
+        task = self._progress.add_task('Processing messages', total=self._ws.max_row - 1)
+        for row_idx in range(2, self._ws.max_row + 1):
+            data = _RowData(*[self._ws.cell(row_idx, col_idx).value for col_idx in range(1, 6)])
+            self._progress.update(
+                task,
+                description=f'Processing message {data.id}',
+                advance=1,
+            )
+            if data.action == '-':
+                self._mstats.skipped()
+                continue
+
+            row_errors = self._validate_row(data)
+            if row_errors:
+                self._mstats.error(row_errors, row_idx)
+                continue
+
+            if data.action == 'create':
+                self._process_create(row_idx, data, task)
+            elif data.action == 'update':
+                self._process_update(row_idx, data, task)
+            elif data.action == 'delete':
+                self._process_delete(row_idx, data, task)
+
+        self._progress.update(task, completed=self._ws.max_row - 1)
+
+    def _validate_row(self, row):  # noqa: CCR001
+        errors = []
+
+        if row.action == 'create' and row.id:
+            errors.append(
+                'the `ID` must not be specified for the `create` action.',
+            )
+            return errors
+        if row.action in ('update', 'delete') and not row.id:
+            errors.append(
+                'the `ID` must be specified for the `update` or `delete` actions.',
+            )
+            return errors
+        if (
+            row.action in ('create', 'update', 'delete')
+            and row.external_id is None
+            or row.value is None
+        ):
+            errors.append(
+                'the `External ID` and `Value` must be specified for the `create`, `update` or `delete` actions.',
+            )
+            return errors
+
+    @staticmethod
+    def _update_sheet_row(ws, row_idx, message):
+        ws.cell(row_idx, 1, value=message['id'])
+        ws.cell(row_idx, 2, value='-')
+        ws.cell(row_idx, 3, value=message['external_id'])
+        ws.cell(row_idx, 4, value=message['value'])
+        ws.cell(row_idx, 5, value=message['auto'])

{connect_cli-29.2 → connect_cli-40.0}/connect/cli/plugins/shared/constants.py

@@ -113,3 +113,11 @@ TRANSLATION_HEADERS = {
     'M': 'Created',
     'N': 'Updated',
 }
+
+MESSAGES_HEADERS = {
+    'A': 'ID',
+    'B': 'Action',
+    'C': 'External ID',
+    'D': 'Value',
+    'E': 'Auto',
+}

{connect_cli-29.2 → connect_cli-40.0}/connect/cli/plugins/shared/utils.py

@@ -19,6 +19,7 @@ from connect.cli.plugins.shared.constants import (
     CONFIGURATION_HEADERS,
     ITEMS_COLS_HEADERS,
     MEDIA_COLS_HEADERS,
+    MESSAGES_HEADERS,
     PARAMS_COLS_HEADERS,
     STATIC_LINK_HEADERS,
     TEMPLATES_HEADERS,
@@ -47,6 +48,8 @@ def get_col_limit_by_ws_type(ws_type):
         return 'N'
     elif ws_type == '_attributes':
         return 'F'
+    elif ws_type == 'messages':
+        return 'E'
     return 'Z'
 
 
@@ -73,6 +76,8 @@ def get_ws_type_by_worksheet_name(ws_name):
         return 'actions'
     elif ws_name == 'Translations':
         return 'translations'
+    elif ws_name == 'Messages':
+        return 'messages'
     return None
 
 
@@ -95,6 +100,8 @@ def get_col_headers_by_ws_type(ws_type):
         return ACTIONS_HEADERS
     elif ws_type == 'translations':
         return TRANSLATION_HEADERS
+    elif ws_type == 'messages':
+        return MESSAGES_HEADERS
 
 
 def wait_for_autotranslation(client, progress, translation, wait_seconds=1, max_counts=5):

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connect-cli"
-version = "29.2"
+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"