robotcode 0.91.0__py3-none-any.whl → 0.92.0__py3-none-any.whl

robotcode/cli/__init__.py

@@ -240,9 +240,8 @@ def robotcode(
 robotcode.add_command(config)
 robotcode.add_command(profiles)
 
-for p in PluginManager().cli_commands:
-    for c in p:
-        robotcode.add_command(c)
+for c in PluginManager.instance().cli_commands:
+    robotcode.add_command(c)
 
 
 @robotcode.command()

robotcode/cli/__version__.py

@@ -1 +1 @@
-__version__ = "0.91.0"
+__version__ = "0.92.0"

robotcode/cli/commands/config.py

@@ -2,7 +2,7 @@ import dataclasses
 import os
 from fnmatch import fnmatchcase
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any, Callable, Dict, Iterable, List, Optional, Type, Union, get_args, get_origin
 
 import click
 
@@ -20,11 +20,9 @@ from robotcode.robot.config.loader import (
     load_robot_config_from_path,
 )
 from robotcode.robot.config.model import (
-    LibDocProfile,
-    RebotProfile,
+    BaseOptions,
     RobotConfig,
     RobotProfile,
-    TestDocProfile,
 )
 from robotcode.robot.config.utils import get_config_files
 
@@ -70,7 +68,11 @@ def show(app: Application, single: bool, paths: List[Path]) -> None:
 
         if single:
             for file, _ in config_files:
-                config = load_robot_config_from_path(file)
+                config = load_robot_config_from_path(
+                    file,
+                    extra_tools={k: v for k, v in PluginManager.instance().tool_config_classes},
+                    verbose_callback=app.verbose,
+                )
                 click.secho(f"File: {file}")
                 app.print_data(
                     config,
@@ -80,7 +82,11 @@ def show(app: Application, single: bool, paths: List[Path]) -> None:
 
             return
 
-        config = load_robot_config_from_path(*config_files)
+        config = load_robot_config_from_path(
+            *config_files,
+            extra_tools={k: v for k, v in PluginManager.instance().tool_config_classes},
+            verbose_callback=app.verbose,
+        )
 
         app.print_data(
             config,
@@ -193,55 +199,51 @@ def info(app: Application) -> None:
     """Shows informations about possible configuration settings."""
 
 
-def get_config_fields() -> Dict[str, Dict[str, str]]:
-    result = {}
-    for field in dataclasses.fields(RobotConfig):
-        field_name_encoded = encode_case_for_field_name(RobotConfig, field)
-        result[field_name_encoded] = {
-            "type": str(field.type),
-            "description": field.metadata.get("description", "").strip(),
-        }
+def type_to_str(t: Union[Type[Any], str]) -> str:
+    if isinstance(t, str):
+        return f"'{t}'"
 
-    for field in dataclasses.fields(RobotProfile):
-        field_name_encoded = encode_case_for_field_name(RobotProfile, field)
-        if field_name_encoded in result:
+    origin = get_origin(t)
+    if origin is None:
+        return t.__name__
+
+    if origin is Union:
+        return " | ".join(type_to_str(a) for a in get_args(t))
+
+    return f"{origin.__name__}[{', '.join(type_to_str(a) for a in get_args(t))}]"
+
+
+def _get_config_fields_for_type(
+    prefix: str, cls: Type[Any], filter: Optional[Callable[[str], bool]] = None
+) -> Dict[str, Dict[str, str]]:
+    result = {}
+    for field in dataclasses.fields(cls):
+        field_name_encoded = encode_case_for_field_name(cls, field)
+        if filter and not filter(field_name_encoded):
             continue
 
-        result["[profile]." + field_name_encoded] = {
-            "type": str(field.type),
+        result[prefix + field_name_encoded] = {
+            "type": type_to_str(field.type),
             "description": field.metadata.get("description", "").strip(),
         }
+        args = get_args(field.type)
 
-    for field in dataclasses.fields(RebotProfile):
-        field_name_encoded = encode_case_for_field_name(RebotProfile, field)
-        result["rebot." + field_name_encoded] = {
-            "type": str(field.type),
-            "description": field.metadata.get("description", "").strip(),
-        }
+        p = f"{prefix}{'' if prefix[-1]=='.' else '.'}" if prefix else ""
+        for a in args:
+            origin = get_origin(a)
+            if origin is None and issubclass(a, BaseOptions):
+                result.update(_get_config_fields_for_type(f"{p}{field_name_encoded}.", a, filter))
+    return result
 
-    for field in dataclasses.fields(LibDocProfile):
-        field_name_encoded = encode_case_for_field_name(LibDocProfile, field)
-        result["libdoc." + field_name_encoded] = {
-            "type": str(field.type),
-            "description": field.metadata.get("description", "").strip(),
-        }
 
-    for field in dataclasses.fields(TestDocProfile):
-        field_name_encoded = encode_case_for_field_name(TestDocProfile, field)
-        result["testdoc." + field_name_encoded] = {
-            "type": str(field.type),
-            "description": field.metadata.get("description", "").strip(),
-        }
+def get_config_fields() -> Dict[str, Dict[str, str]]:
+    result = {}
+    result.update(_get_config_fields_for_type("", RobotConfig))
 
-    for entry in PluginManager().config_classes:
-        for s, cls in entry:
-            if dataclasses.is_dataclass(cls):
-                for field in dataclasses.fields(cls):
-                    field_name_encoded = encode_case_for_field_name(TestDocProfile, field)
-                    result[f"{s}." + field_name_encoded] = {
-                        "type": str(field.type),
-                        "description": field.metadata.get("description", "").strip(),
-                    }
+    result.update(_get_config_fields_for_type("[profile].", RobotProfile, lambda x: x not in result))
+    for entry in PluginManager.instance().tool_config_classes:
+        if dataclasses.is_dataclass(entry.config_class):
+            result.update(_get_config_fields_for_type(f"tool.{entry.tool_name}.", entry.config_class))
 
     return {k: v for k, v in sorted(result.items(), key=lambda item: item[0])}
 
@@ -275,7 +277,15 @@ def list(app: Application, name: Optional[List[str]] = None) -> None:
                 result.append(field)
 
     if app.config.output_format is None or app.config.output_format == OutputFormat.TEXT:
-        app.echo_via_pager(os.linesep.join(result))
+
+        def output() -> Iterable[str]:
+            for r in result:
+                yield r + os.linesep
+
+            yield os.linesep
+            yield f"Total: {len(result)}"
+
+        app.echo_via_pager(output())
     else:
         app.print_data({"names": result})
 

robotcode/cli/commands/profiles.py

@@ -42,7 +42,7 @@ def show(app: Application, no_evaluate: bool, paths: List[Path]) -> None:
     try:
         config_files, _, _ = get_config_files(paths, app.config.config_files, verbose_callback=app.verbose)
 
-        config = load_robot_config_from_path(*config_files).combine_profiles(
+        config = load_robot_config_from_path(*config_files, verbose_callback=app.verbose).combine_profiles(
             *(app.config.profiles or []), verbose_callback=app.verbose, error_callback=app.error
         )
 
@@ -75,7 +75,7 @@ def list(app: Application, paths: List[Path], show_hidden: bool = False, sort_by
     try:
         config_files, _, discovered_by = get_config_files(paths, app.config.config_files, verbose_callback=app.verbose)
 
-        config = load_robot_config_from_path(*config_files)
+        config = load_robot_config_from_path(*config_files, verbose_callback=app.verbose)
 
         _, selected_profiles, enabled_names = config.combine_profiles_ex(
             *(app.config.profiles or []), verbose_callback=app.verbose, error_callback=app.error

{robotcode-0.91.0.dist-info → robotcode-0.92.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotcode
-Version: 0.91.0
+Version: 0.92.0
 Summary: Command line interface for RobotCode
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -33,33 +33,33 @@ Classifier: Topic :: Text Editors :: Integrated Development Environments (IDE)
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: robotcode-core==0.91.0
-Requires-Dist: robotcode-plugin==0.91.0
-Requires-Dist: robotcode-robot==0.91.0
+Requires-Dist: robotcode-core==0.92.0
+Requires-Dist: robotcode-plugin==0.92.0
+Requires-Dist: robotcode-robot==0.92.0
 Provides-Extra: all
 Requires-Dist: docutils; extra == 'all'
 Requires-Dist: pyyaml>=5.4; extra == 'all'
 Requires-Dist: rich; extra == 'all'
-Requires-Dist: robotcode-analyze==0.91.0; extra == 'all'
-Requires-Dist: robotcode-debugger==0.91.0; extra == 'all'
-Requires-Dist: robotcode-language-server==0.91.0; extra == 'all'
-Requires-Dist: robotcode-runner==0.91.0; extra == 'all'
+Requires-Dist: robotcode-analyze==0.92.0; extra == 'all'
+Requires-Dist: robotcode-debugger==0.92.0; extra == 'all'
+Requires-Dist: robotcode-language-server==0.92.0; extra == 'all'
+Requires-Dist: robotcode-runner==0.92.0; extra == 'all'
 Requires-Dist: robotframework-robocop>=2.0.0; extra == 'all'
 Requires-Dist: robotframework-tidy>=2.0.0; extra == 'all'
 Provides-Extra: analyze
-Requires-Dist: robotcode-analyze==0.91.0; extra == 'analyze'
+Requires-Dist: robotcode-analyze==0.92.0; extra == 'analyze'
 Provides-Extra: colored
 Requires-Dist: rich; extra == 'colored'
 Provides-Extra: debugger
-Requires-Dist: robotcode-debugger==0.91.0; extra == 'debugger'
+Requires-Dist: robotcode-debugger==0.92.0; extra == 'debugger'
 Provides-Extra: languageserver
-Requires-Dist: robotcode-language-server==0.91.0; extra == 'languageserver'
+Requires-Dist: robotcode-language-server==0.92.0; extra == 'languageserver'
 Provides-Extra: lint
 Requires-Dist: robotframework-robocop>=2.0.0; extra == 'lint'
 Provides-Extra: rest
 Requires-Dist: docutils; extra == 'rest'
 Provides-Extra: runner
-Requires-Dist: robotcode-runner==0.91.0; extra == 'runner'
+Requires-Dist: robotcode-runner==0.92.0; extra == 'runner'
 Provides-Extra: tidy
 Requires-Dist: robotframework-tidy>=2.0.0; extra == 'tidy'
 Provides-Extra: yaml

robotcode-0.92.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+robotcode/cli/__init__.py,sha256=L68nprRGdjQ27LvEfmg3QcrJXI74mMh8ccrwiA7U1DQ,7104
+robotcode/cli/__main__.py,sha256=hX3nwROMTnsYGT1KS0rXUYrslu9sFzctYdAh66Rcckw,153
+robotcode/cli/__version__.py,sha256=4oQqdZ-jW338RGQfLxI7hoQNb8tTR6y4hzWoJRPdI3o,23
+robotcode/cli/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
+robotcode/cli/commands/__init__.py,sha256=XJHRt_YwMO2Ni2EfL2aj4jkJXMVG6NGFTpzvSVgIRnQ,92
+robotcode/cli/commands/config.py,sha256=Y8MmRDn0VVxC0T7GulK46bFKWXin3nm-aAtEH8b4tyM,10145
+robotcode/cli/commands/profiles.py,sha256=NJ4bjKsvKHXQr1ILjB1H4mZYRgvwXyDKAtCpfSV6lYM,5720
+robotcode-0.92.0.dist-info/METADATA,sha256=hNxnVnUbMTFkONZMYcFf_AaPh__RDWw9IpmNadm3MPY,6628
+robotcode-0.92.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+robotcode-0.92.0.dist-info/entry_points.txt,sha256=Pb4DKVVdJb5PboVl48njwk3DkKQHBJOL1A8KkpemqA8,58
+robotcode-0.92.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
+robotcode-0.92.0.dist-info/RECORD,,

robotcode-0.91.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-robotcode/cli/__init__.py,sha256=6c-evRLgJ0NR08YvynBQzKxAesAbXB0fnrzZ7MvBDM0,7115
-robotcode/cli/__main__.py,sha256=hX3nwROMTnsYGT1KS0rXUYrslu9sFzctYdAh66Rcckw,153
-robotcode/cli/__version__.py,sha256=RBon26SFk4Bs08h0XAmTYW8lrYs3N9ihifF9r6VT4Vc,23
-robotcode/cli/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
-robotcode/cli/commands/__init__.py,sha256=XJHRt_YwMO2Ni2EfL2aj4jkJXMVG6NGFTpzvSVgIRnQ,92
-robotcode/cli/commands/config.py,sha256=fCXhxsotQJl3vMSWpCEM-zwV-tST7sZBH7T-5v9j5EU,10061
-robotcode/cli/commands/profiles.py,sha256=HUCsNMaK75AVSG_A6F1I209xtQH2AICaoLcqpIO7Vjs,5660
-robotcode-0.91.0.dist-info/METADATA,sha256=IW1fsf7rm_4v9JmF4IWn6BhvmxyTOSqjctFnqROtVuA,6628
-robotcode-0.91.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-robotcode-0.91.0.dist-info/entry_points.txt,sha256=Pb4DKVVdJb5PboVl48njwk3DkKQHBJOL1A8KkpemqA8,58
-robotcode-0.91.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
-robotcode-0.91.0.dist-info/RECORD,,