defectdojo-api-generated 2.56.2__tar.gz → 2.56.4__tar.gz

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: defectdojo-api-generated
-Version: 2.56.2
+Version: 2.56.4
 Summary: Python library to interact with DefectDojo - generated from OpenAPI
 Author-email: Filipe Pina <shelf-corncob-said@duck.com>
 Project-URL: Homepage, https://github.com/fopina/defectdojo-api-generated
@@ -12,9 +12,8 @@ Requires-Dist: python-dateutil>=2.8.2
 Requires-Dist: urllib3<3.0.0,>=2.1.0
 Requires-Dist: typing-extensions>=4.7.1
 Provides-Extra: cli
-Requires-Dist: classyclick==0.8.0; extra == "cli"
+Requires-Dist: classyclick==1.0.0; extra == "cli"
 Requires-Dist: jmespath>=1.0.1; extra == "cli"
-Requires-Dist: platformdirs>=4.4.0; extra == "cli"
 Dynamic: license-file
 
 # defectdojo-api-generated
@@ -33,6 +32,7 @@ Multiple changes done on top of default openapi-generator:
 * A friendlier Client class
 * Tweak validations to reduce package import time to about 1/3
 * Remove most of pydantic/schema validations due to inconsistencies with actual database schema/requirements (tracked in https://github.com/fopina/defectdojo-api-generated/issues/39)
+* *Iterator* methods for every *list* API method to handle pagination automatically
 * A nice CLI exposing all the API methods <3
   * installed only as an extra, to keep everything clean when package is used as library only
 
@@ -44,16 +44,21 @@ Multiple changes done on top of default openapi-generator:
 pip install defectojo-api-generated
 ```
 
+<!-- example-id: example.py -->
 ```python
-from defectdojo_api_generated import DefectDojo
-
-# password publicly available in https://github.com/DefectDojo/django-DefectDojo/?tab=readme-ov-file#demo
-dojo = DefectDojo('https://demo.defectdojo.org/', username='admin', password='...')
-r = dojo.findings_api.list()
-print(r.json())
+    from defectdojo_api_generated import DefectDojo
+
+    # password publicly available in https://github.com/DefectDojo/django-DefectDojo/?tab=readme-ov-file#demo
+    dojo = DefectDojo(base_url='https://demo.defectdojo.org/', auth=('admin', PASSWORD))
+    for ind, finding in enumerate(dojo.findings_api.list_iterator(title='Stored XSS')):
+        if not ind:
+            print(f'Total matched findings: {finding.page.count}')
+        print(f'- [{finding.result.severity}] {finding.result.title} - {finding.result.description}')
+    r = dojo.system_settings_api.list(limit=1)
+    print(f'- {r.results[0]}')
 ```
 
-#### **Full documentation** [in docs](docs/README.md)
+#### **Full documentation** [readthedocs](https://defectdojo-api-generated.readthedocs.io/)
 
 ### CLI
 

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/README.md

@@ -14,6 +14,7 @@ Multiple changes done on top of default openapi-generator:
 * A friendlier Client class
 * Tweak validations to reduce package import time to about 1/3
 * Remove most of pydantic/schema validations due to inconsistencies with actual database schema/requirements (tracked in https://github.com/fopina/defectdojo-api-generated/issues/39)
+* *Iterator* methods for every *list* API method to handle pagination automatically
 * A nice CLI exposing all the API methods <3
   * installed only as an extra, to keep everything clean when package is used as library only
 
@@ -25,16 +26,21 @@ Multiple changes done on top of default openapi-generator:
 pip install defectojo-api-generated
 ```
 
+<!-- example-id: example.py -->
 ```python
-from defectdojo_api_generated import DefectDojo
-
-# password publicly available in https://github.com/DefectDojo/django-DefectDojo/?tab=readme-ov-file#demo
-dojo = DefectDojo('https://demo.defectdojo.org/', username='admin', password='...')
-r = dojo.findings_api.list()
-print(r.json())
+    from defectdojo_api_generated import DefectDojo
+
+    # password publicly available in https://github.com/DefectDojo/django-DefectDojo/?tab=readme-ov-file#demo
+    dojo = DefectDojo(base_url='https://demo.defectdojo.org/', auth=('admin', PASSWORD))
+    for ind, finding in enumerate(dojo.findings_api.list_iterator(title='Stored XSS')):
+        if not ind:
+            print(f'Total matched findings: {finding.page.count}')
+        print(f'- [{finding.result.severity}] {finding.result.title} - {finding.result.description}')
+    r = dojo.system_settings_api.list(limit=1)
+    print(f'- {r.results[0]}')
 ```
 
-#### **Full documentation** [in docs](docs/README.md)
+#### **Full documentation** [readthedocs](https://defectdojo-api-generated.readthedocs.io/)
 
 ### CLI
 

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated/__init__.py

@@ -12,7 +12,7 @@ Generated by OpenAPI Generator (https://openapi-generator.tech)
 Do not edit the class manually.
 """  # noqa: E501
 
-__version__ = '2.56.2'
+__version__ = '2.56.4'
 
 # Define package exports
 __all__ = [

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated/cli/__main__.py

@@ -1,15 +1,6 @@
 """Command-line entrypoint for defectdojo_api_generated."""
 
-import importlib
-import pkgutil
 import sys
-from pathlib import Path
-
-
-def discover_commands():
-    # str() required because of py3.10
-    for _, module_name, _ in pkgutil.iter_modules([str(Path(__file__).parent / 'commands')]):
-        importlib.import_module(f'{__package__}.commands.{module_name}')
 
 
 def load_cli():
@@ -28,7 +19,6 @@ def load_cli():
 
 def main():
     CLI = load_cli()
-    discover_commands()
     CLI.click()
 
 

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated/cli/commands/apis.py

@@ -33,7 +33,7 @@ _PRIMITIVE_CLICK_TYPES = (
 )
 
 
-class API(CLI.SubGroup, classyclick.Group):
+class API(CLI.SubGroup):
     """Interact directly with any API/method"""
 
 
@@ -326,7 +326,7 @@ def _build_command_namespace(command_name: str, api_class: type, target_method:
 def _build_command_class(parent_class: type, namespace: dict[str, Any]) -> type:
     return type(
         'ApiCommand',
-        (parent_class, classyclick.Command),
+        (parent_class,),
         namespace,
     )
 
@@ -572,7 +572,7 @@ def make_api_group(module_name: str, api_class: type) -> type:
         _, target_method = command_methods[0]
         return make_api_command(api_class, group_name, target_method, parent_class=API.Command)
 
-    class ApiGroup(API.SubGroup, classyclick.Group):
+    class ApiGroup(API.SubGroup):
         __config__ = classyclick.Group.Config(
             name=group_name,
             help=f'methods from `{api_class.__name__}`.',

defectdojo_api_generated-2.56.4/defectdojo_api_generated/cli/commands/cli.py

@@ -0,0 +1,75 @@
+"""Command-line entrypoint for defectdojo_api_generated."""
+
+import logging
+from pathlib import Path
+
+import classyclick
+import click
+
+from defectdojo_api_generated.client import DefectDojo
+
+from ... import __version__
+
+
+class CLI(classyclick.helpers.ConfigFileMixin, classyclick.Group):
+    """DefectDojo CLI"""
+
+    __config__ = classyclick.Group.Config(
+        context_settings=dict(show_default=True),
+        decorators=[click.version_option(version=__version__, message='%(version)s')],
+    )
+    CONFIG_DEFAULT_NAME = 'defectdojo-generated-api'
+    CONFIG_EXAMPLE_PATH = Path(__file__).parent.parent / 'config.example.toml'
+
+    host: str = classyclick.Option(
+        '-h',
+        envvar='DEFECTDOJO_HOST',
+        show_envvar=True,
+        help='DefectDojo server host',
+    )
+    token: str = classyclick.Option(
+        '-t',
+        envvar='DEFECTDOJO_TOKEN',
+        show_envvar=True,
+        help='DefectDojo API token - if provided, --user/--password are ignored',
+    )
+    user: str = classyclick.Option(
+        '-u',
+        envvar='DEFECTDOJO_USER',
+        show_envvar=True,
+        help='DefectDojo API username',
+    )
+    password: str = classyclick.Option(
+        '-p',
+        envvar='DEFECTDOJO_PASSWORD',
+        show_envvar=True,
+        help='DefectDojo API password',
+    )
+    disable_tls: bool = classyclick.Option(help='Disable TLS verification in DefectDojo API requests')
+    debug_http: bool = classyclick.Option(help='Log HTTP requests and responses')
+
+    def __call__(self):
+        self.load_config()
+
+        if self.debug_http:
+            import http.client
+
+            http.client.HTTPConnection.debuglevel = 1
+            http.client.HTTPSConnection.debuglevel = 1
+            logging.basicConfig(level=logging.DEBUG)
+            http_client_logger = logging.getLogger('http.client')
+            http_client_logger.setLevel(logging.DEBUG)
+
+        self.ctx.meta['client'] = DefectDojo(
+            base_url=self.host,
+            token=self.token,
+            auth=None if self.token else (self.user, self.password),
+            verify_ssl=not self.disable_tls,
+        )
+
+
+class Config(classyclick.helpers.ConfigBaseCommand, CLI.Command):
+    pass
+
+
+classyclick.helpers.discover_commands(__package__)

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated/cli/commands/status.py

@@ -8,7 +8,7 @@ from defectdojo_api_generated.client import DefectDojo
 from .cli import CLI
 
 
-class Status(CLI.Command, classyclick.Command):
+class Status(CLI.Command):
     """Quick connectivity check"""
 
     client: DefectDojo = classyclick.ContextMeta('client')

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated/configuration.py

@@ -569,7 +569,7 @@ class Configuration:
             'Python SDK Debug Report:\n'
             'OS: {env}\n'
             'Python Version: {pyversion}\n'
-            'Version of the API: 2.56.2\n'
+            'Version of the API: 2.56.4\n'
             'SDK Package Version: 1.0.0'.format(env=sys.platform, pyversion=sys.version)
         )
 

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated/models/patched_system_settings_request.py

@@ -164,7 +164,6 @@ class PatchedSystemSettingsRequest(BaseModel):
     allow_anonymous_survey_repsonse: Optional[StrictBool] = Field(
         default=None, description='Enable anyone with a link to the survey to answer a survey'
     )
-    credentials: Optional[Annotated[str, Field(strict=True, max_length=3000)]] = None
     disclaimer_notifications: Optional[Annotated[str, Field(strict=True, max_length=3000)]] = Field(
         default=None, description='Include this custom disclaimer on all notifications'
     )
@@ -305,7 +304,6 @@ class PatchedSystemSettingsRequest(BaseModel):
         'enable_notify_sla_jira_only',
         'enable_notify_sla_exponential_backoff',
         'allow_anonymous_survey_repsonse',
-        'credentials',
         'disclaimer_notifications',
         'disclaimer_reports',
         'disclaimer_reports_forced',
@@ -491,7 +489,6 @@ class PatchedSystemSettingsRequest(BaseModel):
                 'enable_notify_sla_jira_only': obj.get('enable_notify_sla_jira_only'),
                 'enable_notify_sla_exponential_backoff': obj.get('enable_notify_sla_exponential_backoff'),
                 'allow_anonymous_survey_repsonse': obj.get('allow_anonymous_survey_repsonse'),
-                'credentials': obj.get('credentials'),
                 'disclaimer_notifications': obj.get('disclaimer_notifications'),
                 'disclaimer_reports': obj.get('disclaimer_reports'),
                 'disclaimer_reports_forced': obj.get('disclaimer_reports_forced'),

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated/models/system_settings.py

@@ -165,7 +165,6 @@ class SystemSettings(BaseModel):
     allow_anonymous_survey_repsonse: Optional[StrictBool] = Field(
         default=None, description='Enable anyone with a link to the survey to answer a survey'
     )
-    credentials: Optional[Annotated[str, Field(strict=True, max_length=3000)]] = None
     disclaimer_notifications: Optional[Annotated[str, Field(strict=True, max_length=3000)]] = Field(
         default=None, description='Include this custom disclaimer on all notifications'
     )
@@ -307,7 +306,6 @@ class SystemSettings(BaseModel):
         'enable_notify_sla_jira_only',
         'enable_notify_sla_exponential_backoff',
         'allow_anonymous_survey_repsonse',
-        'credentials',
         'disclaimer_notifications',
         'disclaimer_reports',
         'disclaimer_reports_forced',
@@ -499,7 +497,6 @@ class SystemSettings(BaseModel):
                 'enable_notify_sla_jira_only': obj.get('enable_notify_sla_jira_only'),
                 'enable_notify_sla_exponential_backoff': obj.get('enable_notify_sla_exponential_backoff'),
                 'allow_anonymous_survey_repsonse': obj.get('allow_anonymous_survey_repsonse'),
-                'credentials': obj.get('credentials'),
                 'disclaimer_notifications': obj.get('disclaimer_notifications'),
                 'disclaimer_reports': obj.get('disclaimer_reports'),
                 'disclaimer_reports_forced': obj.get('disclaimer_reports_forced'),

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated/models/system_settings_request.py

@@ -164,7 +164,6 @@ class SystemSettingsRequest(BaseModel):
     allow_anonymous_survey_repsonse: Optional[StrictBool] = Field(
         default=None, description='Enable anyone with a link to the survey to answer a survey'
     )
-    credentials: Optional[Annotated[str, Field(strict=True, max_length=3000)]] = None
     disclaimer_notifications: Optional[Annotated[str, Field(strict=True, max_length=3000)]] = Field(
         default=None, description='Include this custom disclaimer on all notifications'
     )
@@ -305,7 +304,6 @@ class SystemSettingsRequest(BaseModel):
         'enable_notify_sla_jira_only',
         'enable_notify_sla_exponential_backoff',
         'allow_anonymous_survey_repsonse',
-        'credentials',
         'disclaimer_notifications',
         'disclaimer_reports',
         'disclaimer_reports_forced',
@@ -491,7 +489,6 @@ class SystemSettingsRequest(BaseModel):
                 'enable_notify_sla_jira_only': obj.get('enable_notify_sla_jira_only'),
                 'enable_notify_sla_exponential_backoff': obj.get('enable_notify_sla_exponential_backoff'),
                 'allow_anonymous_survey_repsonse': obj.get('allow_anonymous_survey_repsonse'),
-                'credentials': obj.get('credentials'),
                 'disclaimer_notifications': obj.get('disclaimer_notifications'),
                 'disclaimer_reports': obj.get('disclaimer_reports'),
                 'disclaimer_reports_forced': obj.get('disclaimer_reports_forced'),

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: defectdojo-api-generated
-Version: 2.56.2
+Version: 2.56.4
 Summary: Python library to interact with DefectDojo - generated from OpenAPI
 Author-email: Filipe Pina <shelf-corncob-said@duck.com>
 Project-URL: Homepage, https://github.com/fopina/defectdojo-api-generated
@@ -12,9 +12,8 @@ Requires-Dist: python-dateutil>=2.8.2
 Requires-Dist: urllib3<3.0.0,>=2.1.0
 Requires-Dist: typing-extensions>=4.7.1
 Provides-Extra: cli
-Requires-Dist: classyclick==0.8.0; extra == "cli"
+Requires-Dist: classyclick==1.0.0; extra == "cli"
 Requires-Dist: jmespath>=1.0.1; extra == "cli"
-Requires-Dist: platformdirs>=4.4.0; extra == "cli"
 Dynamic: license-file
 
 # defectdojo-api-generated
@@ -33,6 +32,7 @@ Multiple changes done on top of default openapi-generator:
 * A friendlier Client class
 * Tweak validations to reduce package import time to about 1/3
 * Remove most of pydantic/schema validations due to inconsistencies with actual database schema/requirements (tracked in https://github.com/fopina/defectdojo-api-generated/issues/39)
+* *Iterator* methods for every *list* API method to handle pagination automatically
 * A nice CLI exposing all the API methods <3
   * installed only as an extra, to keep everything clean when package is used as library only
 
@@ -44,16 +44,21 @@ Multiple changes done on top of default openapi-generator:
 pip install defectojo-api-generated
 ```
 
+<!-- example-id: example.py -->
 ```python
-from defectdojo_api_generated import DefectDojo
-
-# password publicly available in https://github.com/DefectDojo/django-DefectDojo/?tab=readme-ov-file#demo
-dojo = DefectDojo('https://demo.defectdojo.org/', username='admin', password='...')
-r = dojo.findings_api.list()
-print(r.json())
+    from defectdojo_api_generated import DefectDojo
+
+    # password publicly available in https://github.com/DefectDojo/django-DefectDojo/?tab=readme-ov-file#demo
+    dojo = DefectDojo(base_url='https://demo.defectdojo.org/', auth=('admin', PASSWORD))
+    for ind, finding in enumerate(dojo.findings_api.list_iterator(title='Stored XSS')):
+        if not ind:
+            print(f'Total matched findings: {finding.page.count}')
+        print(f'- [{finding.result.severity}] {finding.result.title} - {finding.result.description}')
+    r = dojo.system_settings_api.list(limit=1)
+    print(f'- {r.results[0]}')
 ```
 
-#### **Full documentation** [in docs](docs/README.md)
+#### **Full documentation** [readthedocs](https://defectdojo-api-generated.readthedocs.io/)
 
 ### CLI
 

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated.egg-info/SOURCES.txt

@@ -88,9 +88,9 @@ defectdojo_api_generated/api/user_contact_infos_api.py
 defectdojo_api_generated/api/user_profile_api.py
 defectdojo_api_generated/api/users_api.py
 defectdojo_api_generated/cli/__main__.py
+defectdojo_api_generated/cli/commands/__init__.py
 defectdojo_api_generated/cli/commands/apis.py
 defectdojo_api_generated/cli/commands/cli.py
-defectdojo_api_generated/cli/commands/config.py
 defectdojo_api_generated/cli/commands/status.py
 defectdojo_api_generated/models/__init__.py
 defectdojo_api_generated/models/accepted_risk_request.py

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/defectdojo_api_generated.egg-info/requires.txt

@@ -4,6 +4,5 @@ urllib3<3.0.0,>=2.1.0
 typing-extensions>=4.7.1
 
 [cli]
-classyclick==0.8.0
+classyclick==1.0.0
 jmespath>=1.0.1
-platformdirs>=4.4.0

{defectdojo_api_generated-2.56.2 → defectdojo_api_generated-2.56.4}/pyproject.toml

@@ -18,9 +18,8 @@ dependencies = [
 
 [project.optional-dependencies]
 cli = [
-    "classyclick==0.8.0",
+    "classyclick==1.0.0",
     "jmespath>=1.0.1",
-    "platformdirs>=4.4.0",
 ]
 
 [project.scripts]
@@ -31,9 +30,12 @@ defectdojo-api-generated = "defectdojo_api_generated.cli.__main__:main"
 [dependency-groups]
 dev = [
     "build",
+    "mkdocs>=1.6.1",
+    "mkdocs-click>=0.9.0",
     "pytest",
     "pytest-cov",
     "pytest-socket",
+    "readme-example-tester>=0.0.2",
     "ruff",
     "twine",
 ]

defectdojo_api_generated-2.56.2/defectdojo_api_generated/cli/commands/cli.py

@@ -1,151 +0,0 @@
-"""Command-line entrypoint for defectdojo_api_generated."""
-
-import logging
-from pathlib import Path
-from typing import Optional
-
-import classyclick
-import click
-from platformdirs import user_config_dir
-
-from defectdojo_api_generated.client import DefectDojo
-
-from ... import __version__
-
-try:
-    # Python 3.11+
-    import tomllib
-except ModuleNotFoundError:
-    # Python < 3.11
-    import tomli as tomllib  # type: ignore
-
-
-DEFAULT_PATH = Path(user_config_dir('defectdojo-generated-api')) / 'config.toml'
-
-
-def ensure_config_file(config_path: Optional[Path]) -> Path:
-    config_path = config_path or DEFAULT_PATH
-    if not config_path.exists():
-        config_path.parent.mkdir(parents=True, exist_ok=True)
-        config_path.write_text((Path(__file__).parent.parent / 'config.example.toml').read_text())
-        print(f'Info: No configuration file found at {config_path}, a sample config has been placed there.')
-
-    return config_path
-
-
-def load_config_data(config_path: Path) -> dict:
-    with config_path.open('rb') as f:
-        return tomllib.load(f)
-
-
-class CLI(classyclick.Group):
-    """DefectDojo CLI"""
-
-    __config__ = classyclick.Group.Config(context_settings=dict(show_default=True))
-
-    config: Path = classyclick.Option(help='Path to the configuration file', show_default=str(DEFAULT_PATH))
-    env: str = classyclick.Option(
-        '-e', help='Environment to use for the command (as many can be specified in config.toml)'
-    )
-    host: str = classyclick.Option(
-        '-h',
-        envvar='DEFECTDOJO_HOST',
-        show_envvar=True,
-        help='DefectDojo server host',
-    )
-    token: str = classyclick.Option(
-        '-t',
-        envvar='DEFECTDOJO_TOKEN',
-        show_envvar=True,
-        help='DefectDojo API token - if provided, --user/--password are ignored',
-    )
-    user: str = classyclick.Option(
-        '-u',
-        envvar='DEFECTDOJO_USER',
-        show_envvar=True,
-        help='DefectDojo API username',
-    )
-    password: str = classyclick.Option(
-        '-p',
-        envvar='DEFECTDOJO_PASSWORD',
-        show_envvar=True,
-        help='DefectDojo API password',
-    )
-    disable_tls: bool = classyclick.Option(help='Disable TLS verification in DefectDojo API requests')
-    debug_http: bool = classyclick.Option(help='Log HTTP requests and responses')
-    ctx: classyclick.Context = classyclick.Context()
-
-    def __call__(self):
-        self.config = ensure_config_file(self.config)
-        config_data = load_config_data(self.config)
-
-        if self.env is None:
-            self.env = config_data.get('default_env')
-
-        # allow empty string to choose root environment when "default_env" is set to something else
-        if self.env:
-            if self.env not in config_data.get('env', {}):
-                raise click.ClickException(f'Environment "{self.env}" not found in {self.config}')
-            env_config = config_data['env'][self.env]
-            config_data = merge_dicts(config_data, env_config)
-
-        # to late to have these options from default_map, so process them manually
-        if self.host is None:
-            self.host = config_data.get('host')
-
-        if self.token is None:
-            self.token = config_data.get('token')
-
-        if self.user is None:
-            self.user = config_data.get('user')
-
-        if self.password is None:
-            self.password = config_data.get('password')
-
-        if self.disable_tls is None:
-            self.disable_tls = config_data.get('disable_tls', False)
-
-        if self.debug_http:
-            import http.client
-
-            http.client.HTTPConnection.debuglevel = 1
-            http.client.HTTPSConnection.debuglevel = 1
-            logging.basicConfig(level=logging.DEBUG)
-            http_client_logger = logging.getLogger('http.client')
-            http_client_logger.setLevel(logging.DEBUG)
-
-        self.ctx.meta['client'] = DefectDojo(
-            base_url=self.host,
-            token=self.token,
-            auth=None if self.token else (self.user, self.password),
-            verify_ssl=not self.disable_tls,
-        )
-        self.ctx.meta['config_path'] = self.config
-        self.ctx.meta['config_data'] = config_data
-        self.ctx.meta['selected_env'] = self.env
-
-        self.ctx.default_map = config_data
-
-
-def merge_dicts(base: dict, override: dict) -> dict:
-    """
-    To merge two Python dictionaries where:
-    * nested dictionaries should merge recursively
-    * lists and other values should be replaced entirely
-
-    by ChatGPT
-    """
-    result = base.copy()
-    for key, value in override.items():
-        if key in result:
-            if isinstance(result[key], dict) and isinstance(value, dict):
-                result[key] = merge_dicts(result[key], value)
-            else:
-                result[key] = value
-        else:
-            result[key] = value
-    return result
-
-
-# TODO: classyclick missing @click.version_option - https://github.com/fopina/classyclick/issues/48
-CLI.click = click.version_option(version=__version__, message='%(version)s')(CLI.click)

defectdojo_api_generated-2.56.2/defectdojo_api_generated/cli/commands/config.py

@@ -1,71 +0,0 @@
-"""Configuration inspection and editing command."""
-
-import json
-import os
-import shlex
-import shutil
-import subprocess
-
-import classyclick
-import click
-
-from .cli import CLI
-
-_MASKED = '<masked>'
-_SECRET_FIELD_PARTS = ('token', 'password')
-
-
-def _mask_value(key: str, value):
-    if isinstance(value, dict):
-        return {nested_key: _mask_value(nested_key, nested_value) for nested_key, nested_value in value.items()}
-
-    if isinstance(value, list):
-        return [_mask_value(key, item) for item in value]
-
-    if value is None:
-        return None
-
-    if any(part in key.lower() for part in _SECRET_FIELD_PARTS):
-        return _MASKED
-
-    return value
-
-
-def _resolve_editor() -> str:
-    editor = os.environ.get('VISUAL') or os.environ.get('EDITOR')
-    if editor:
-        return editor
-
-    for fallback in ('vim', 'vi', 'nano'):
-        if shutil.which(fallback):
-            return fallback
-
-    raise click.ClickException('No editor configured. Set VISUAL or EDITOR, or install vim, vi, or nano.')
-
-
-class Config(CLI.Command, classyclick.Command):
-    """Show or edit the current CLI configuration"""
-
-    edit: bool = classyclick.Option('-e', help='Open the config file in $VISUAL or $EDITOR')
-
-    def __call__(self):
-        ctx = click.get_current_context().find_root()
-        config_path = ctx.meta['config_path']
-
-        if self.edit:
-            editor = _resolve_editor()
-            try:
-                subprocess.run([*shlex.split(editor), str(config_path)], check=True)
-            except FileNotFoundError as exc:
-                raise click.ClickException(f'Editor command not found: {editor}') from exc
-            except subprocess.CalledProcessError as exc:
-                raise click.ClickException(f'Editor exited with status {exc.returncode}') from exc
-            return
-
-        config = {key: value for key, value in ctx.meta['config_data'].items() if key != 'env'}
-
-        click.echo(f'Config file: {click.style(str(config_path), bold=True)}')
-        if ctx.meta['selected_env']:
-            click.echo(f'Environment: {click.style(ctx.meta["selected_env"], bold=True)}')
-
-        click.echo(json.dumps(_mask_value('config', config), indent=2, sort_keys=True))