aiqtoolkit 1.1.0rc1__py3-none-any.whl → 1.1.0rc2__py3-none-any.whl

aiq/builder/eval_builder.py

@@ -27,6 +27,7 @@ from aiq.data_models.config import AIQConfig
 from aiq.data_models.config import GeneralConfig
 from aiq.data_models.evaluate import EvalGeneralConfig
 from aiq.data_models.evaluator import EvaluatorBaseConfig
+from aiq.data_models.function import EmptyFunctionConfig
 from aiq.utils.type_utils import override
 
 logger = logging.getLogger(__name__)
@@ -102,7 +103,10 @@ class WorkflowEvalBuilder(WorkflowBuilder, EvalBuilder):
         return tools
 
     async def populate_builder(self, config: AIQConfig):
-        await super().populate_builder(config)
+        # Skip setting workflow if workflow config is EmptyFunctionConfig
+        skip_workflow = isinstance(config.workflow, EmptyFunctionConfig)
+
+        await super().populate_builder(config, skip_workflow)
         # Instantiate the evaluators
         for name, evaluator_config in config.eval.evaluators.items():
             await self.add_evaluator(name, evaluator_config)

aiq/builder/workflow_builder.py

@@ -586,8 +586,15 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
     def get_user_manager(self):
         return UserManagerHolder(context=AIQContext(self._context_state))
 
-    async def populate_builder(self, config: AIQConfig):
+    async def populate_builder(self, config: AIQConfig, skip_workflow: bool = False):
+        """
+        Populate the builder with components and optionally set up the workflow.
+
+        Args:
+            config (AIQConfig): The configuration object containing component definitions.
+            skip_workflow (bool): If True, skips the workflow instantiation step. Defaults to False.
 
+        """
         # Generate the build sequence
         build_sequence = build_dependency_sequence(config)
 
@@ -614,7 +621,8 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
                 raise ValueError(f"Unknown component group {component_instance.component_group}")
 
         # Instantiate the workflow
-        await self.set_workflow(config.workflow)
+        if not skip_workflow:
+            await self.set_workflow(config.workflow)
 
     @classmethod
     @asynccontextmanager

aiq/cli/commands/info/info.py

@@ -19,6 +19,7 @@ import click
 
 from aiq.cli.commands.info.list_channels import list_channels
 from aiq.cli.commands.info.list_components import list_components
+from aiq.cli.commands.info.list_mcp import list_mcp
 
 logger = logging.getLogger(__name__)
 
@@ -35,3 +36,4 @@ def info_command(**kwargs):
 
 info_command.add_command(list_components, name="components")
 info_command.add_command(list_channels, "channels")
+info_command.add_command(list_mcp, "mcp")

aiq/cli/commands/info/list_mcp.py

@@ -0,0 +1,126 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+import logging
+
+import anyio
+import click
+
+from aiq.tool.mcp.mcp_client import MCPBuilder
+
+# Suppress verbose logs from mcp.client.sse and httpx
+logging.getLogger("mcp.client.sse").setLevel(logging.WARNING)
+logging.getLogger("httpx").setLevel(logging.WARNING)
+
+
+def format_tool(tool):
+    name = getattr(tool, 'name', None)
+    description = getattr(tool, 'description', '')
+    input_schema = getattr(tool, 'input_schema', None) or getattr(tool, 'inputSchema', None)
+
+    schema_str = None
+    if input_schema:
+        if hasattr(input_schema, "schema_json"):
+            schema_str = input_schema.schema_json(indent=2)
+        else:
+            schema_str = str(input_schema)
+
+    return {
+        "name": name,
+        "description": description,
+        "input_schema": schema_str,
+    }
+
+
+def print_tool(tool_dict, detail=False):
+    click.echo(f"Tool: {tool_dict['name']}")
+    if detail or tool_dict.get('input_schema') or tool_dict.get('description'):
+        click.echo(f"Description: {tool_dict['description']}")
+        if tool_dict["input_schema"]:
+            click.echo("Input Schema:")
+            click.echo(tool_dict["input_schema"])
+        else:
+            click.echo("Input Schema: None")
+        click.echo("-" * 60)
+
+
+async def list_tools_and_schemas(url, tool_name=None):
+    builder = MCPBuilder(url=url)
+    try:
+        if tool_name:
+            tool = await builder.get_tool(tool_name)
+            return [format_tool(tool)]
+        else:
+            tools = await builder.get_tools()
+            return [format_tool(tool) for tool in tools.values()]
+    except Exception as e:
+        click.echo(f"[ERROR] Failed to fetch tools via MCPBuilder: {e}", err=True)
+        return []
+
+
+async def list_tools_direct(url, tool_name=None):
+    from mcp import ClientSession
+    from mcp.client.sse import sse_client
+
+    try:
+        async with sse_client(url=url) as (read, write):
+            async with ClientSession(read, write) as session:
+                await session.initialize()
+                response = await session.list_tools()
+
+                tools = []
+                for tool in response.tools:
+                    if tool_name:
+                        if tool.name == tool_name:
+                            return [format_tool(tool)]
+                    else:
+                        tools.append(format_tool(tool))
+                if tool_name and not tools:
+                    click.echo(f"[INFO] Tool '{tool_name}' not found.")
+                return tools
+    except Exception as e:
+        click.echo(f"[ERROR] Failed to fetch tools via direct protocol: {e}", err=True)
+        return []
+
+
+@click.group(invoke_without_command=True, help="List tool names (default), or show details with --detail or --tool.")
+@click.option('--direct', is_flag=True, help='Bypass MCPBuilder and use direct MCP protocol')
+@click.option('--url', default='http://localhost:9901/sse', show_default=True, help='MCP server URL')
+@click.option('--tool', default=None, help='Get details for a specific tool by name')
+@click.option('--detail', is_flag=True, help='Show full details for all tools')
+@click.option('--json-output', is_flag=True, help='Output tool metadata in JSON format')
+@click.pass_context
+def list_mcp(ctx, direct, url, tool, detail, json_output):
+    """
+    List tool names (default). Use --detail for full output. If --tool is provided,
+    always show full output for that tool.
+    """
+    if ctx.invoked_subcommand is not None:
+        return
+    fetcher = list_tools_direct if direct else list_tools_and_schemas
+    tools = anyio.run(fetcher, url, tool)
+
+    if json_output:
+        click.echo(json.dumps(tools, indent=2))
+    elif tool:
+        for tool_dict in tools:
+            print_tool(tool_dict, detail=True)
+    elif detail:
+        for tool_dict in tools:
+            print_tool(tool_dict, detail=True)
+    else:
+        for tool_dict in tools:
+            click.echo(tool_dict['name'])

aiq/data_models/discovery_metadata.py

@@ -150,7 +150,11 @@ class DiscoveryMetadata(BaseModel):
                 logger.error("Encountered issue getting distro_name for module %s", module.__name__)
                 return DiscoveryMetadata(status=DiscoveryStatusEnum.FAILURE)
 
-            version = importlib.metadata.version(distro_name) if distro_name != "" else ""
+            try:
+                version = importlib.metadata.version(distro_name) if distro_name != "" else ""
+            except importlib.metadata.PackageNotFoundError:
+                logger.warning("Package metadata not found for %s", distro_name)
+                version = ""
         except Exception as e:
             logger.exception("Encountered issue extracting module metadata for %s: %s", config_type, e, exc_info=True)
             return DiscoveryMetadata(status=DiscoveryStatusEnum.FAILURE)
@@ -185,7 +189,11 @@ class DiscoveryMetadata(BaseModel):
             module = inspect.getmodule(fn)
             root_package: str = module.__package__.split(".")[0]
             root_package = DiscoveryMetadata.get_distribution_name(root_package)
-            version = importlib.metadata.version(root_package) if root_package != "" else ""
+            try:
+                version = importlib.metadata.version(root_package) if root_package != "" else ""
+            except importlib.metadata.PackageNotFoundError:
+                logger.warning("Package metadata not found for %s", root_package)
+                version = ""
         except Exception as e:
             logger.exception("Encountered issue extracting module metadata for %s: %s", fn, e, exc_info=True)
             return DiscoveryMetadata(status=DiscoveryStatusEnum.FAILURE)
@@ -213,10 +221,15 @@ class DiscoveryMetadata(BaseModel):
 
         try:
             package_name = DiscoveryMetadata.get_distribution_name(package_name)
-            metadata = importlib.metadata.metadata(package_name)
-            description = metadata.get("Summary", "")
-            if (package_version is None):
-                package_version = importlib.metadata.version(package_name)
+            try:
+                metadata = importlib.metadata.metadata(package_name)
+                description = metadata.get("Summary", "")
+                if (package_version is None):
+                    package_version = importlib.metadata.version(package_name)
+            except importlib.metadata.PackageNotFoundError:
+                logger.warning("Package metadata not found for %s", package_name)
+                description = ""
+                package_version = package_version or ""
         except Exception as e:
             logger.exception("Encountered issue extracting module metadata for %s: %s", package_name, e, exc_info=True)
             return DiscoveryMetadata(status=DiscoveryStatusEnum.FAILURE)
@@ -252,7 +265,11 @@ class DiscoveryMetadata(BaseModel):
             module = inspect.getmodule(config_type)
             root_package: str = module.__package__.split(".")[0]
             root_package = DiscoveryMetadata.get_distribution_name(root_package)
-            version = importlib.metadata.version(root_package) if root_package != "" else ""
+            try:
+                version = importlib.metadata.version(root_package) if root_package != "" else ""
+            except importlib.metadata.PackageNotFoundError:
+                logger.warning("Package metadata not found for %s", root_package)
+                version = ""
         except Exception as e:
             logger.exception("Encountered issue extracting module metadata for %s: %s", config_type, e, exc_info=True)
             return DiscoveryMetadata(status=DiscoveryStatusEnum.FAILURE)

aiq/eval/evaluate.py

@@ -177,8 +177,10 @@ class EvaluationRun:  # pylint: disable=too-many-public-methods
         workflow_output_file.parent.mkdir(parents=True, exist_ok=True)
 
         # Write the workflow output to a file (this can be used for re-running the evaluation)
-        workflow_output = dataset_handler.publish_eval_input(
-            self.eval_input, self.eval_config.general.output.workflow_output_step_filter)
+
+        step_filter = self.eval_config.general.output.workflow_output_step_filter \
+            if self.eval_config.general.output else None
+        workflow_output = dataset_handler.publish_eval_input(self.eval_input, step_filter)
         with open(workflow_output_file, "w", encoding="utf-8") as f:
             # set indent to 2 for pretty printing
             f.write(workflow_output)

{aiqtoolkit-1.1.0rc1.dist-info → aiqtoolkit-1.1.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiqtoolkit
-Version: 1.1.0rc1
+Version: 1.1.0rc2
 Summary: Agent Intelligence Toolkit (AIQ Toolkit)
 Author: NVIDIA Corporation
 Maintainer: NVIDIA Corporation

{aiqtoolkit-1.1.0rc1.dist-info → aiqtoolkit-1.1.0rc2.dist-info}/RECORD

@@ -21,7 +21,7 @@ aiq/builder/builder.py,sha256=JE3uCw6qTmWX2akUfS-Ga5WSiJVTzBjDQPniiONMjy4,7448
 aiq/builder/component_utils.py,sha256=2jIXWSLIlKxDKAO7kdXz_4BHqQNWw4t9GmcQfw0ER4g,12923
 aiq/builder/context.py,sha256=Sk2Vcduz7zbGkJe28VxCDt8GC5GKDhwvl1zLuRBTmss,8574
 aiq/builder/embedder.py,sha256=M-n2oXSlwE7u-nmpzRbPq6UVWtFtMvrEdKqqsbKQZLk,965
-aiq/builder/eval_builder.py,sha256=nNsSc33rjdYjJdgqK77W5YWvn5RjCJ03bBrOQ0HYBRg,4437
+aiq/builder/eval_builder.py,sha256=UnNgtQiDAUfT3yuwjZQVerenI09-4q0Cse9uwLjk3Fg,4657
 aiq/builder/evaluator.py,sha256=O6Gu0cUwQkrPxPX29Vf_-RopgijxPnhy7mhg_j-9A84,1162
 aiq/builder/framework_enum.py,sha256=eYwHQifZ86dx-OTubVA3qhCLRqhB4ElMBYBGA0gYtic,885
 aiq/builder/front_end.py,sha256=Xhvfi4VcDh5EoCtLr6AlLQfbRm8_TyugUc_IRfirN6Y,2225
@@ -33,7 +33,7 @@ aiq/builder/llm.py,sha256=DcoYCyschsRjkW_yGsa_Ci7ELSpk5KRbi9778Dm_B9c,951
 aiq/builder/retriever.py,sha256=GM7L1T4NdNZKerFZiCfLcQOwsGoX0NRlF8my7SMq3l4,970
 aiq/builder/user_interaction_manager.py,sha256=OXr-RxWf1sEZjzQH_jt0nmqrLBtYLHGEZEcfDYYFV88,2913
 aiq/builder/workflow.py,sha256=UOjrXmu1sxWTxTjygszqYgK0gK65r_beLKUwOpxtXuc,5894
-aiq/builder/workflow_builder.py,sha256=bl893QITWZbfEwGOQkVUIukLiggz7JvGvQ4lTAATja8,29319
+aiq/builder/workflow_builder.py,sha256=LBlNc3HiKzMxI5XNiV4hj9PVLH1N6p9ErHWgWaRZsZM,29694
 aiq/cli/__init__.py,sha256=Xs1JQ16L9btwreh4pdGKwskffAw1YFO48jKrU4ib_7c,685
 aiq/cli/entrypoint.py,sha256=BJsCZgC2nVyAWj7tBXwW67OIteg833xAI54R-e9O8oc,4757
 aiq/cli/main.py,sha256=yVTX5-5-21OOfG8qAdcK3M1fCQUxdr3G37Mb5OldPQc,1772
@@ -55,9 +55,10 @@ aiq/cli/commands/configure/channel/channel.py,sha256=3y4lCk1PqqKPLlPtBo-B7jkUZ-K
 aiq/cli/commands/configure/channel/remove.py,sha256=zvLw1gRwF58erC1EWbPiWbPMRYXfNNcf2SKusBqsm24,1104
 aiq/cli/commands/configure/channel/update.py,sha256=vsQzt4vFAg5PsmbRimrKoChtkGUSsVywusOrUxgLWd0,1100
 aiq/cli/commands/info/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
-aiq/cli/commands/info/info.py,sha256=tkpAssNarrxAX9Bd3xE46q_sDyaCKS7AT7IaAnhwua8,1265
+aiq/cli/commands/info/info.py,sha256=ePgsfHfmfAkjg-MoS9AIfY0Zqm0GSEG3Blid821-woc,1359
 aiq/cli/commands/info/list_channels.py,sha256=OVmb_BtCQiH5j2KVd0srwMUW90JUHyNIU7tqo2GdiGc,1292
 aiq/cli/commands/info/list_components.py,sha256=1qkJazV_dsoCVd4T8Vjv3F7Kg7P7xmzMjLs2o0fkpws,4483
+aiq/cli/commands/info/list_mcp.py,sha256=OOTtmCUFoeWX3SslMACsDvhlu_BAf-4grIT0gf04cbs,4632
 aiq/cli/commands/registry/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
 aiq/cli/commands/registry/publish.py,sha256=uPKJ_pvHkDohvIYlGtkGSoo6KCftBtC-vRDUfmUyceE,3234
 aiq/cli/commands/registry/pull.py,sha256=jMR9NP7rV4g1WuUxGXUXjMgv0tV3UAJTKrTZvstx-Tc,4119
@@ -79,7 +80,7 @@ aiq/data_models/component.py,sha256=x6jm1Fhn1k1hGu-5AjM0ywuyvs6ztaZfapD8bLUXSqc,
 aiq/data_models/component_ref.py,sha256=GyyIf4k80aUIn6LV9r84m5imbiVhpdaY7uKMMpYpbzU,3872
 aiq/data_models/config.py,sha256=ERLjZY0iqexZ-gSXsCSN1UqgNeiwkEjWdYJEdKqeYTY,14116
 aiq/data_models/dataset_handler.py,sha256=SifWhFHtxTMEjrXaXOYQgBOSKfWOzkc6OtOoPJ39pD4,3978
-aiq/data_models/discovery_metadata.py,sha256=nF3SfGO_XER2bIPaSlTfXOCBbrZvWPuf0GVRUcbUXZk,11946
+aiq/data_models/discovery_metadata.py,sha256=OcITQc5VeML4bTHurrsMNiK_oB3z7wudMxcyN7LI8pY,12785
 aiq/data_models/embedder.py,sha256=0v917IiohVA_7zdF7hoO_zQcmNe4hQEFhh4fxRiYBbk,940
 aiq/data_models/evaluate.py,sha256=Llu9_H840nbV_nAimcFQaTeK6oLRmGac9UKsoaLlL58,3786
 aiq/data_models/evaluator.py,sha256=bd2njsyQB2t6ClJ66gJiCjYHsQpWZwPD7rsU0J109TI,939
@@ -106,7 +107,7 @@ aiq/embedder/openai_embedder.py,sha256=5FO3xsyNvEmbLBsZb3xsCpbN1Soxio4yf4b5gTPVx
 aiq/embedder/register.py,sha256=3MTZrfNQKp6AZTbfaA-PpTnyXiMyu-8HH9JnDCC0v9o,978
 aiq/eval/__init__.py,sha256=Xs1JQ16L9btwreh4pdGKwskffAw1YFO48jKrU4ib_7c,685
 aiq/eval/config.py,sha256=IlOr2o618kbkXP0G1F-AklZfsKYVos9UB4Dvlxf66xk,1431
-aiq/eval/evaluate.py,sha256=MI7ufASKJGrdsiIVUd4jmcRxwgyZ_8dOY39uyVZKy6Y,14543
+aiq/eval/evaluate.py,sha256=WPGLBeJ46mwIlnprbtia1cm2MwMqZ-GskXoTn6R4oV0,14624
 aiq/eval/intermediate_step_adapter.py,sha256=D645cfnncBEYc-LhYNwr0NwweCr1kTLENt1pLNvmVvU,4211
 aiq/eval/register.py,sha256=QOHJqA2CQixeWMC9InyKbzXo1jByvrntD_m9-2Mvg9k,1076
 aiq/eval/remote_workflow.py,sha256=Fb7Z6gdP2L_gqyWB--AEWfcXe9xPpQ_hPsf9lmqGXjI,5524
@@ -305,10 +306,10 @@ aiq/utils/reactive/base/observer_base.py,sha256=UAlyAY_ky4q2t0P81RVFo2Bs_R7z5Nde
 aiq/utils/reactive/base/subject_base.py,sha256=Ed-AC6P7cT3qkW1EXjzbd5M9WpVoeN_9KCe3OM3FLU4,2521
 aiq/utils/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aiq/utils/settings/global_settings.py,sha256=U9TCLdoZsKq5qOVGjREipGVv9e-FlStzqy5zv82_VYk,7454
-aiqtoolkit-1.1.0rc1.dist-info/licenses/LICENSE-3rd-party.txt,sha256=8o7aySJa9CBvFshPcsRdJbczzdNyDGJ8b0J67WRUQ2k,183936
-aiqtoolkit-1.1.0rc1.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-aiqtoolkit-1.1.0rc1.dist-info/METADATA,sha256=L6nqvLQoUMRV0jjfk_p4E5SExTm_ESY6RF_LqcCGKwg,20132
-aiqtoolkit-1.1.0rc1.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-aiqtoolkit-1.1.0rc1.dist-info/entry_points.txt,sha256=gRlPfR5g21t328WNEQ4CcEz80S1sJNS8A7rMDYnzl4A,452
-aiqtoolkit-1.1.0rc1.dist-info/top_level.txt,sha256=fo7AzYcNhZ_tRWrhGumtxwnxMew4xrT1iwouDy_f0Kc,4
-aiqtoolkit-1.1.0rc1.dist-info/RECORD,,
+aiqtoolkit-1.1.0rc2.dist-info/licenses/LICENSE-3rd-party.txt,sha256=8o7aySJa9CBvFshPcsRdJbczzdNyDGJ8b0J67WRUQ2k,183936
+aiqtoolkit-1.1.0rc2.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+aiqtoolkit-1.1.0rc2.dist-info/METADATA,sha256=K7cu558y6_mxK5lUhD7PdHte-yDX3Y1qDjbuRgCqwrQ,20132
+aiqtoolkit-1.1.0rc2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+aiqtoolkit-1.1.0rc2.dist-info/entry_points.txt,sha256=gRlPfR5g21t328WNEQ4CcEz80S1sJNS8A7rMDYnzl4A,452
+aiqtoolkit-1.1.0rc2.dist-info/top_level.txt,sha256=fo7AzYcNhZ_tRWrhGumtxwnxMew4xrT1iwouDy_f0Kc,4
+aiqtoolkit-1.1.0rc2.dist-info/RECORD,,