pygeai 0.3.2__py3-none-any.whl → 0.4.0__py3-none-any.whl

pygeai/cli/commands/lab/ai_lab.py

@@ -9,6 +9,7 @@ from pygeai.cli.commands.lab.common import get_agent_data_prompt_inputs, get_age
 from pygeai.cli.texts.help import AI_LAB_HELP_TEXT
 from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
 from pygeai.core.utils.console import Console
+from pygeai.cli.commands.lab.options import PROJECT_ID_OPTION
 from pygeai.lab.agents.clients import AgentClient
 from pygeai.lab.processes.clients import AgenticProcessClient
 from pygeai.lab.strategies.clients import ReasoningStrategyClient
@@ -49,12 +50,8 @@ def list_agents(option_list: list):
         if option_flag.name == "allow_external":
             allow_external = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
-
-    client = AgentClient()
+    client = AgentClient(project_id=project_id)
     result = client.list_agents(
-        project_id=project_id,
         status=status,
         start=start,
         count=count,
@@ -66,12 +63,7 @@ def list_agents(option_list: list):
 
 
 list_agents_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "status",
         ["--status"],
@@ -128,6 +120,7 @@ def create_agent(option_list: list):
     agent_data_llm_temperature = None
     agent_data_llm_top_k = None
     agent_data_llm_top_p = None
+    agent_data_strategy_name = None
     agent_data_model_name = None
     agent_data_resource_pools = None
     automatic_publish = False
@@ -202,6 +195,8 @@ def create_agent(option_list: list):
             agent_data_llm_top_k = option_arg
         if option_flag.name == "agent_data_llm_top_p":
             agent_data_llm_top_p = option_arg
+        if option_flag.name == "agent_data_strategy_name":
+            agent_data_strategy_name = option_arg
         if option_flag.name == "agent_data_model_name":
             agent_data_model_name = option_arg
         if option_flag.name == "agent_data_resource_pools":
@@ -218,8 +213,6 @@ def create_agent(option_list: list):
         if option_flag.name == "automatic_publish":
             automatic_publish = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (name and access_scope and public_name):
         raise MissingRequirementException("Cannot create assistant without specifying name, access scope and public name")
 
@@ -246,9 +239,8 @@ def create_agent(option_list: list):
         {"name": agent_data_model_name}
     ]
 
-    client = AgentClient()
+    client = AgentClient(project_id=project_id)
     result = client.create_agent(
-        project_id=project_id,
         name=name,
         access_scope=access_scope,
         public_name=public_name,
@@ -257,6 +249,7 @@ def create_agent(option_list: list):
         description=description,
         agent_data_prompt=agent_data_prompt,
         agent_data_llm_config=agent_data_llm_config,
+        agent_data_strategy_name=agent_data_strategy_name,
         agent_data_models=agent_data_models,
         agent_data_resource_pools=agent_data_resource_pools,
         automatic_publish=automatic_publish
@@ -265,12 +258,7 @@ def create_agent(option_list: list):
 
 
 create_agent_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "Unique identifier of the project where the agent will be created",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "name",
         ["--name", "-n"],
@@ -362,6 +350,12 @@ create_agent_options = [
         "TopP sampling parameter for LLM (currently unused)",
         True
     ),
+    Option(
+        "agent_data_strategy_name",
+        ["--agent-data-strategy-name", "--strategy-name"],
+        "Name of the reasoning strategy to use",
+        True
+    ),
     Option(
         "agent_data_model_name",
         ["--agent-data-model-name", "--adm-name"],
@@ -403,12 +397,11 @@ def get_agent(option_list: list):
         if option_flag.name == "allow_drafts":
             allow_drafts = get_boolean_value(option_arg)
 
-    if not (project_id and agent_id):
-        raise MissingRequirementException("Project ID and Agent id must be specified.")
+    if not agent_id:
+        raise MissingRequirementException("Agent ID must be specified.")
 
-    client = AgentClient()
+    client = AgentClient(project_id=project_id)
     result = client.get_agent(
-        project_id=project_id,
         agent_id=agent_id,
         revision=revision,
         version=version,
@@ -418,12 +411,7 @@ def get_agent(option_list: list):
 
 
 get_agent_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -464,13 +452,11 @@ def export_agent(option_list: list):
         if option_flag.name == "file":
             file = option_arg
 
+    if not agent_id:
+        raise MissingRequirementException("Agent ID must be specified.")
 
-    if not (project_id and agent_id):
-        raise MissingRequirementException("Project ID and Agent id must be specified.")
-
-    client = AgentClient()
+    client = AgentClient(project_id=project_id)
     result = client.export_agent(
-        project_id=project_id,
         agent_id=agent_id,
     )
     if file:
@@ -488,12 +474,7 @@ def export_agent(option_list: list):
 
 
 export_agent_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -520,8 +501,8 @@ def import_agent(option_list: list):
             file = option_arg
 
 
-    if not (project_id and file):
-        raise MissingRequirementException("Project ID  and file path to spec must be specified.")
+    if not file:
+        raise MissingRequirementException("File path to spec must be specified.")
 
     try:
         with open(file, "r") as f:
@@ -530,9 +511,8 @@ def import_agent(option_list: list):
         logger.error(f"File is not in JSON format: {e}")
         Console.write_stderr(f"File is not in JSON format.")
 
-    client = AgentClient()
+    client = AgentClient(project_id=project_id)
     result = client.import_agent(
-        project_id=project_id,
         data=agent_data
     )
 
@@ -541,12 +521,7 @@ def import_agent(option_list: list):
 
 
 import_agent_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "file",
         ["--file", "-f"],
@@ -566,24 +541,18 @@ def create_sharing_link(option_list: list):
         if option_flag.name == "agent_id":
             agent_id = option_arg
 
-    if not (project_id and agent_id):
-        raise MissingRequirementException("Project ID and Agent id must be specified.")
+    if not agent_id:
+        raise MissingRequirementException("Agent ID must be specified.")
 
-    client = AgentClient()
+    client = AgentClient(project_id=project_id)
     result = client.create_sharing_link(
-        project_id=project_id,
         agent_id=agent_id,
     )
     Console.write_stdout(f"Sharing token: \n{result}")
 
 
 create_sharing_link_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -606,12 +575,11 @@ def publish_agent_revision(option_list: list):
         if option_flag.name == "revision":
             revision = option_arg
 
-    if not (project_id and agent_id and revision):
-        raise MissingRequirementException("Project ID, Agent ID and revision must be specified.")
+    if not (agent_id and revision):
+        raise MissingRequirementException("Agent ID and revision must be specified.")
 
-    client = AgentClient()
+    client = AgentClient(project_id=project_id)
     result = client.publish_agent_revision(
-        project_id=project_id,
         agent_id=agent_id,
         revision=revision
     )
@@ -619,12 +587,7 @@ def publish_agent_revision(option_list: list):
 
 
 publish_agent_revision_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -650,24 +613,18 @@ def delete_agent(option_list: list):
         if option_flag.name == "agent_id":
             agent_id = option_arg
 
-    if not (project_id and agent_id):
-        raise MissingRequirementException("Project ID and Agent ID must be specified.")
+    if not agent_id:
+        raise MissingRequirementException("Agent ID must be specified.")
 
-    client = AgentClient()
+    client = AgentClient(project_id=project_id)
     result = client.delete_agent(
-        project_id=project_id,
         agent_id=agent_id,
     )
     Console.write_stdout(f"Deleted agent detail: \n{result}")
 
 
 delete_agent_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -695,6 +652,7 @@ def update_agent(option_list: list):
     agent_data_llm_temperature = None
     agent_data_llm_top_k = None
     agent_data_llm_top_p = None
+    agent_data_strategy_name = None
     agent_data_model_name = None
     agent_data_resource_pools = None
     automatic_publish = False
@@ -771,7 +729,9 @@ def update_agent(option_list: list):
         if option_flag.name == "agent_data_llm_top_k":
             agent_data_llm_top_k = option_arg
         if option_flag.name == "agent_data_llm_top_p":
-            agent_data_llm_top_p = option_arg
+            agent_data_llm_top_k = option_arg
+        if option_flag.name == "agent_data_strategy_name":
+            agent_data_strategy_name = option_arg
         if option_flag.name == "agent_data_model_name":
             agent_data_model_name = option_arg
         if option_flag.name == "agent_data_resource_pools":
@@ -790,9 +750,6 @@ def update_agent(option_list: list):
         if option_flag.name == "upsert":
             upsert = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
-
     if not (name and access_scope and public_name):
         raise MissingRequirementException("Cannot update assistant without specifying name, access scope and public name")
 
@@ -819,9 +776,8 @@ def update_agent(option_list: list):
         {"name": agent_data_model_name}
     ]
 
-    client = AgentClient()
+    client = AgentClient(project_id=project_id)
     result = client.update_agent(
-        project_id=project_id,
         agent_id=agent_id,
         name=name,
         access_scope=access_scope,
@@ -831,6 +787,7 @@ def update_agent(option_list: list):
         description=description,
         agent_data_prompt=agent_data_prompt,
         agent_data_llm_config=agent_data_llm_config,
+        agent_data_strategy_name=agent_data_strategy_name,
         agent_data_models=agent_data_models,
         agent_data_resource_pools=agent_data_resource_pools,
         automatic_publish=automatic_publish,
@@ -840,12 +797,7 @@ def update_agent(option_list: list):
 
 
 update_agent_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "Unique identifier of the project where the agent will be created",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -943,6 +895,12 @@ update_agent_options = [
         "TopP sampling parameter for LLM (currently unused)",
         True
     ),
+    Option(
+        "agent_data_strategy_name",
+        ["--agent-data-strategy-name", "--strategy-name"],
+        "Name of the reasoning strategy to use",
+        True
+    ),
     Option(
         "agent_data_model_name",
         ["--agent-data-model-name", "--adm-name"],
@@ -1030,8 +988,6 @@ def create_tool(option_list: list):
         if option_flag.name == "automatic_publish":
             automatic_publish = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not name:
         raise MissingRequirementException("Tool name must be specified.")
     if access_scope == "public" and not public_name:
@@ -1043,9 +999,8 @@ def create_tool(option_list: list):
 
     tool_parameters = get_tool_parameters(parameters)
 
-    client = ToolClient()
+    client = ToolClient(project_id=project_id)
     result = client.create_tool(
-        project_id=project_id,
         name=name,
         description=description,
         scope=scope,
@@ -1062,12 +1017,7 @@ def create_tool(option_list: list):
 
 
 create_tool_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "Unique identifier of the project where the tool will be created",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "name",
         ["--name", "-n"],
@@ -1162,15 +1112,11 @@ def list_tools(option_list: list):
         if option_flag.name == "allow_external":
             allow_external = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
-
     if scope and scope not in VALID_SCOPES:
         raise ValueError(f"Scope must be one of {', '.join(VALID_SCOPES)}.")
 
-    client = ToolClient()
+    client = ToolClient(project_id=project_id)
     result = client.list_tools(
-        project_id=project_id,
         id=id,
         count=count,
         access_scope=access_scope,
@@ -1182,12 +1128,7 @@ def list_tools(option_list: list):
 
 
 list_tools_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "id",
         ["--id"],
@@ -1246,12 +1187,11 @@ def get_tool(option_list: list):
         if option_flag.name == "allow_drafts":
             allow_drafts = get_boolean_value(option_arg)
 
-    if not (project_id and tool_id):
-        raise MissingRequirementException("Project ID and Tool id must be specified.")
+    if not tool_id:
+        raise MissingRequirementException("Tool ID must be specified.")
 
-    client = ToolClient()
+    client = ToolClient(project_id=project_id)
     result = client.get_tool(
-        project_id=project_id,
         tool_id=tool_id,
         revision=revision,
         version=version,
@@ -1261,12 +1201,7 @@ def get_tool(option_list: list):
 
 
 get_tool_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1308,12 +1243,11 @@ def export_tool(option_list: list):
             file = option_arg
 
 
-    if not (project_id and tool_id):
-        raise MissingRequirementException("Project ID and Tool id must be specified.")
+    if not tool_id:
+        raise MissingRequirementException("Tool ID must be specified.")
 
-    client = ToolClient()
+    client = ToolClient(project_id=project_id)
     result = client.export_tool(
-        project_id=project_id,
         tool_id=tool_id,
     )
     Console.write_stdout(f"Tool spec: \n{result}")
@@ -1330,12 +1264,7 @@ def export_tool(option_list: list):
 
 
 export_tool_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1360,17 +1289,16 @@ def delete_tool(option_list: list):
     for option_flag, option_arg in option_list:
         if option_flag.name == "project_id":
             project_id = option_arg
-        elif option_flag.name == "tool_id":
+        if option_flag.name == "tool_id":
             tool_id = option_arg
         elif option_flag.name == "tool_name":
             tool_name = option_arg
 
-    if not project_id or not (tool_id or tool_name):
-        raise MissingRequirementException("Project ID and either Tool ID or Tool Name must be specified.")
+    if not (tool_id or tool_name):
+        raise MissingRequirementException("Either Tool ID or Tool Name must be specified.")
 
-    client = ToolClient()
+    client = ToolClient(project_id=project_id)
     result = client.delete_tool(
-        project_id=project_id,
         tool_id=tool_id,
         tool_name=tool_name
     )
@@ -1378,12 +1306,7 @@ def delete_tool(option_list: list):
 
 
 delete_tool_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1463,8 +1386,6 @@ def update_tool(option_list: list):
         if option_flag.name == "upsert":
             upsert = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not tool_id:
         raise MissingRequirementException("Tool ID must be specified.")
     if access_scope == "public" and not public_name:
@@ -1476,9 +1397,8 @@ def update_tool(option_list: list):
 
     tool_parameters = get_tool_parameters(parameters)
 
-    client = ToolClient()
+    client = ToolClient(project_id=project_id)
     result = client.update_tool(
-        project_id=project_id,
         tool_id=tool_id,
         name=name,
         description=description,
@@ -1497,12 +1417,7 @@ def update_tool(option_list: list):
 
 
 update_tool_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "Unique identifier of the project containing the tool",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1597,12 +1512,11 @@ def publish_tool_revision(option_list: list):
         if option_flag.name == "revision":
             revision = option_arg
 
-    if not (project_id and tool_id and revision):
-        raise MissingRequirementException("Project ID, Tool ID and revision must be specified.")
+    if not (tool_id and revision):
+        raise MissingRequirementException("Tool ID and revision must be specified.")
 
-    client = ToolClient()
+    client = ToolClient(project_id=project_id)
     result = client.publish_tool_revision(
-        project_id=project_id,
         tool_id=tool_id,
         revision=revision
     )
@@ -1610,12 +1524,7 @@ def publish_tool_revision(option_list: list):
 
 
 publish_tool_revision_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1653,12 +1562,11 @@ def get_parameter(option_list: list):
         if option_flag.name == "version":
             version = option_arg
 
-    if not (project_id and (tool_public_name or tool_id)):
-        raise MissingRequirementException("Project ID and Tool public name or ID must be specified.")
+    if not (tool_public_name or tool_id):
+        raise MissingRequirementException("Tool public name or ID must be specified.")
 
-    client = ToolClient()
+    client = ToolClient(project_id=project_id)
     result = client.get_parameter(
-        project_id=project_id,
         tool_id=tool_id,
         tool_public_name=tool_public_name,
         revision=revision,
@@ -1669,12 +1577,7 @@ def get_parameter(option_list: list):
 
 
 get_parameter_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1736,8 +1639,6 @@ def set_parameter(option_list: list):
                     "\"isRequired\": true, \"type\": \"config\", \"fromSecret\": false, \"value\": \"config_value\"}'"
                 )
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (tool_public_name or tool_id):
         raise MissingRequirementException("Tool public name or ID must be specified.")
     if not parameters:
@@ -1745,9 +1646,8 @@ def set_parameter(option_list: list):
 
     tool_parameters = get_tool_parameters(parameters)
 
-    client = ToolClient()
+    client = ToolClient(project_id=project_id)
     result = client.set_parameter(
-        project_id=project_id,
         tool_id=tool_id,
         tool_public_name=tool_public_name,
         parameters=tool_parameters
@@ -1756,12 +1656,7 @@ def set_parameter(option_list: list):
 
 
 set_parameter_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1860,7 +1755,6 @@ list_reasoning_strategies_options = [
 
 
 def create_reasoning_strategy(option_list: list):
-    project_id = None
     name = None
     system_prompt = None
     access_scope = "public"
@@ -1869,8 +1763,6 @@ def create_reasoning_strategy(option_list: list):
     automatic_publish = False
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "name":
             name = option_arg
         if option_flag.name == "system_prompt":
@@ -1893,8 +1785,6 @@ def create_reasoning_strategy(option_list: list):
         if option_flag.name == "automatic_publish":
             automatic_publish = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not name:
         raise MissingRequirementException("Name must be specified.")
     if not system_prompt:
@@ -1914,7 +1804,6 @@ def create_reasoning_strategy(option_list: list):
 
     client = ReasoningStrategyClient()
     result = client.create_reasoning_strategy(
-        project_id=project_id,
         name=name,
         system_prompt=system_prompt,
         access_scope=access_scope,
@@ -1926,12 +1815,6 @@ def create_reasoning_strategy(option_list: list):
 
 
 create_reasoning_strategy_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "name",
         ["--name", "-n"],
@@ -1974,7 +1857,6 @@ create_reasoning_strategy_options = [
 
 
 def update_reasoning_strategy(option_list: list):
-    project_id = None
     reasoning_strategy_id = None
     name = None
     system_prompt = None
@@ -1985,8 +1867,6 @@ def update_reasoning_strategy(option_list: list):
     upsert = False
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "reasoning_strategy_id":
             reasoning_strategy_id = option_arg
         if option_flag.name == "name":
@@ -2014,8 +1894,6 @@ def update_reasoning_strategy(option_list: list):
             # upsert = get_boolean_value(option_arg)
             Console.write_stdout("Upsert is not yet supported for reasoning strategies. Coming soon.")
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not reasoning_strategy_id:
         raise MissingRequirementException("Reasoning strategy ID must be specified.")
 
@@ -2035,7 +1913,6 @@ def update_reasoning_strategy(option_list: list):
 
     client = ReasoningStrategyClient()
     result = client.update_reasoning_strategy(
-        project_id=project_id,
         reasoning_strategy_id=reasoning_strategy_id,
         name=name,
         system_prompt=system_prompt,
@@ -2049,12 +1926,6 @@ def update_reasoning_strategy(option_list: list):
 
 
 update_reasoning_strategy_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "reasoning_strategy_id",
         ["--reasoning-strategy-id", "--rsid"],
@@ -2109,26 +1980,20 @@ update_reasoning_strategy_options = [
 
 
 def get_reasoning_strategy(option_list: list):
-    project_id = None
     reasoning_strategy_id = None
     reasoning_strategy_name = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "reasoning_strategy_id":
             reasoning_strategy_id = option_arg
         if option_flag.name == "reasoning_strategy_name":
             reasoning_strategy_name = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (reasoning_strategy_id or reasoning_strategy_name):
         raise MissingRequirementException("Either reasoning strategy ID or name must be specified.")
 
     client = ReasoningStrategyClient()
     result = client.get_reasoning_strategy(
-        project_id=project_id,
         reasoning_strategy_id=reasoning_strategy_id,
         reasoning_strategy_name=reasoning_strategy_name
     )
@@ -2136,12 +2001,6 @@ def get_reasoning_strategy(option_list: list):
 
 
 get_reasoning_strategy_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "reasoning_strategy_id",
         ["--reasoning-strategy-id", "--rsid"],
@@ -2264,16 +2123,13 @@ def create_process(option_list: list):
         if option_flag.name == "automatic_publish":
             automatic_publish = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not key:
         raise MissingRequirementException("Key must be specified.")
     if not name:
         raise MissingRequirementException("Name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.create_process(
-        project_id=project_id,
         key=key,
         name=name,
         description=description,
@@ -2290,12 +2146,7 @@ def create_process(option_list: list):
 
 
 create_process_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "key",
         ["--key", "-k"],
@@ -2489,14 +2340,11 @@ def update_process(option_list: list):
         if option_flag.name == "upsert":
             upsert = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (process_id or name):
         raise MissingRequirementException("Either process ID or name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.update_process(
-        project_id=project_id,
         process_id=process_id,
         name=name,
         key=key,
@@ -2515,12 +2363,7 @@ def update_process(option_list: list):
 
 
 update_process_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -2638,14 +2481,11 @@ def get_process(option_list: list):
         if option_flag.name == "allow_drafts":
             allow_drafts = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (process_id or process_name):
         raise MissingRequirementException("Either process ID or process name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.get_process(
-        project_id=project_id,
         process_id=process_id,
         process_name=process_name,
         revision=revision,
@@ -2656,12 +2496,7 @@ def get_process(option_list: list):
 
 
 get_process_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -2720,12 +2555,8 @@ def list_processes(option_list: list):
         if option_flag.name == "allow_draft":
             allow_draft = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
-
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.list_processes(
-        project_id=project_id,
         id=id,
         name=name,
         status=status,
@@ -2737,12 +2568,7 @@ def list_processes(option_list: list):
 
 
 list_processes_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "id",
         ["--id"],
@@ -2801,14 +2627,11 @@ def list_processes_instances(option_list: list):
         if option_flag.name == "count":
             count = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not process_id:
         raise MissingRequirementException("Process ID must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.list_process_instances(
-        project_id=project_id,
         process_id=process_id,
         is_active=is_active,
         start=start,
@@ -2818,12 +2641,7 @@ def list_processes_instances(option_list: list):
 
 
 list_processes_instances_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -2864,14 +2682,11 @@ def delete_process(option_list: list):
         if option_flag.name == "process_name":
             process_name = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (process_id or process_name):
         raise MissingRequirementException("Either process ID or process name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.delete_process(
-        project_id=project_id,
         process_id=process_id,
         process_name=process_name
     )
@@ -2879,12 +2694,7 @@ def delete_process(option_list: list):
 
 
 delete_process_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -2916,16 +2726,13 @@ def publish_process_revision(option_list: list):
         if option_flag.name == "revision":
             revision = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (process_id or process_name):
         raise MissingRequirementException("Either process ID or process name must be specified.")
     if not revision:
         raise MissingRequirementException("Revision must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.publish_process_revision(
-        project_id=project_id,
         process_id=process_id,
         process_name=process_name,
         revision=revision
@@ -2934,12 +2741,7 @@ def publish_process_revision(option_list: list):
 
 
 publish_process_revision_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -3002,14 +2804,11 @@ def create_task(option_list: list):
         if option_flag.name == "automatic_publish":
             automatic_publish = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not name:
         raise MissingRequirementException("Task name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.create_task(
-        project_id=project_id,
         name=name,
         description=description,
         title_template=title_template,
@@ -3022,12 +2821,7 @@ def create_task(option_list: list):
 
 
 create_task_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "name",
         ["--name", "-n"],
@@ -3086,14 +2880,11 @@ def get_task(option_list: list):
         if option_flag.name == "task_name":
             task_name = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (task_id or task_name):
         raise MissingRequirementException("Either task ID or task name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.get_task(
-        project_id=project_id,
         task_id=task_id,
         task_name=task_name
     )
@@ -3101,12 +2892,7 @@ def get_task(option_list: list):
 
 
 get_task_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "task_id",
         ["--task-id", "--tid"],
@@ -3141,12 +2927,8 @@ def list_tasks(option_list: list):
         if option_flag.name == "allow_drafts":
             allow_drafts = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
-
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.list_tasks(
-        project_id=project_id,
         id=id,
         start=start,
         count=count,
@@ -3156,12 +2938,7 @@ def list_tasks(option_list: list):
 
 
 list_tasks_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "id",
         ["--id"],
@@ -3233,14 +3010,11 @@ def update_task(option_list: list):
         if option_flag.name == "upsert":
             upsert = get_boolean_value(option_arg)
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (task_id or name):
         raise MissingRequirementException("Either task ID or name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.update_task(
-        project_id=project_id,
         task_id=task_id,
         name=name,
         description=description,
@@ -3255,12 +3029,7 @@ def update_task(option_list: list):
 
 
 update_task_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "task_id",
         ["--task-id", "--tid"],
@@ -3331,14 +3100,11 @@ def delete_task(option_list: list):
         if option_flag.name == "task_name":
             task_name = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (task_id or task_name):
         raise MissingRequirementException("Either task ID or task name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.delete_task(
-        project_id=project_id,
         task_id=task_id,
         task_name = task_name
     )
@@ -3346,12 +3112,7 @@ def delete_task(option_list: list):
 
 
 delete_task_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "task_id",
         ["--task-id", "--tid"],
@@ -3383,16 +3144,13 @@ def publish_task_revision(option_list: list):
         if option_flag.name == "revision":
             revision = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (task_id or task_name):
         raise MissingRequirementException("Either task ID or task name must be specified.")
     if not revision:
         raise MissingRequirementException("Revision must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.publish_task_revision(
-        project_id=project_id,
         task_id=task_id,
         task_name=task_name,
         revision=revision
@@ -3401,12 +3159,7 @@ def publish_task_revision(option_list: list):
 
 
 publish_task_revision_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "task_id",
         ["--task-id", "--tid"],
@@ -3452,14 +3205,11 @@ def start_instance(option_list: list):
                     "Variables must be a JSON list: '[{\"key\": \"location\", \"value\": \"Paris\"}]'"
                 )
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not process_name:
         raise MissingRequirementException("Process name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.start_instance(
-        project_id=project_id,
         process_name=process_name,
         subject=subject,
         variables=variables
@@ -3468,12 +3218,7 @@ def start_instance(option_list: list):
 
 
 start_instance_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "process_name",
         ["--process-name", "--pn"],
@@ -3505,26 +3250,18 @@ def abort_instance(option_list: list):
         if option_flag.name == "instance_id":
             instance_id = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not instance_id:
         raise MissingRequirementException("Instance ID must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.abort_instance(
-        project_id=project_id,
         instance_id=instance_id
     )
     Console.write_stdout(f"Abort instance result: \n{result}")
 
 
 abort_instance_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "instance_id",
         ["--instance-id", "--iid"],
@@ -3544,26 +3281,18 @@ def get_instance(option_list: list):
         if option_flag.name == "instance_id":
             instance_id = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not instance_id:
         raise MissingRequirementException("Instance ID must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.get_instance(
-        project_id=project_id,
         instance_id=instance_id
     )
     Console.write_stdout(f"Instance detail: \n{result}")
 
 
 get_instance_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "instance_id",
         ["--instance-id", "--iid"],
@@ -3583,26 +3312,18 @@ def get_instance_history(option_list: list):
         if option_flag.name == "instance_id":
             instance_id = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not instance_id:
         raise MissingRequirementException("Instance ID must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.get_instance_history(
-        project_id=project_id,
         instance_id=instance_id
     )
     Console.write_stdout(f"Instance history: \n{result}")
 
 
 get_instance_history_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "instance_id",
         ["--instance-id", "--iid"],
@@ -3621,26 +3342,18 @@ def get_thread_information(option_list: list):
         if option_flag.name == "thread_id":
             thread_id = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not thread_id:
         raise MissingRequirementException("Thread ID must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.get_thread_information(
-        project_id=project_id,
         thread_id=thread_id
     )
     Console.write_stdout(f"Thread information: \n{result}")
 
 
 get_thread_information_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "thread_id",
         ["--thread-id", "--tid"],
@@ -3663,16 +3376,13 @@ def send_user_signal(option_list: list):
         if option_flag.name == "signal_name":
             signal_name = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not instance_id:
         raise MissingRequirementException("Instance ID must be specified.")
     if not signal_name:
         raise MissingRequirementException("Signal name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.send_user_signal(
-        project_id=project_id,
         instance_id=instance_id,
         signal_name=signal_name
     )
@@ -3680,12 +3390,7 @@ def send_user_signal(option_list: list):
 
 
 send_user_signal_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "instance_id",
         ["--instance-id", "--iid"],
@@ -3733,14 +3438,11 @@ def create_kb(option_list: list):
                     "Metadata must be a JSON list of strings: '[\"meta1\", \"meta2\"]'"
                 )
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not name:
         raise MissingRequirementException("Name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.create_kb(
-        project_id=project_id,
         name=name,
         artifacts=artifacts,
         metadata=metadata
@@ -3749,12 +3451,7 @@ def create_kb(option_list: list):
 
 
 create_kb_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "name",
         ["--name", "-n"],
@@ -3789,14 +3486,11 @@ def get_kb(option_list: list):
         if option_flag.name == "kb_name":
             kb_name = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (kb_id or kb_name):
         raise MissingRequirementException("Either KB ID or KB name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.get_kb(
-        project_id=project_id,
         kb_id=kb_id,
         kb_name=kb_name
     )
@@ -3804,12 +3498,7 @@ def get_kb(option_list: list):
 
 
 get_kb_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "kb_id",
         ["--kb-id", "--kid"],
@@ -3841,12 +3530,8 @@ def list_kbs(option_list: list):
         if option_flag.name == "count":
             count = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
-
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.list_kbs(
-        project_id=project_id,
         name=name,
         start=start,
         count=count
@@ -3855,12 +3540,7 @@ def list_kbs(option_list: list):
 
 
 list_kbs_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "name",
         ["--name", "-n"],
@@ -3895,14 +3575,11 @@ def delete_kb(option_list: list):
         if option_flag.name == "kb_name":
             kb_name = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
     if not (kb_id or kb_name):
         raise MissingRequirementException("Either KB ID or KB name must be specified.")
 
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.delete_kb(
-        project_id=project_id,
         kb_id=kb_id,
         kb_name=kb_name
     )
@@ -3910,12 +3587,7 @@ def delete_kb(option_list: list):
 
 
 delete_kb_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "kb_id",
         ["--kb-id", "--kid"],
@@ -3955,12 +3627,8 @@ def list_jobs(option_list: list):
         if option_flag.name == "name":
             name = option_arg
 
-    if not project_id:
-        raise MissingRequirementException("Project ID must be specified.")
-
-    client = AgenticProcessClient()
+    client = AgenticProcessClient(project_id=project_id)
     result = client.list_jobs(
-        project_id=project_id,
         start=start,
         count=count,
         topic=topic,
@@ -3971,12 +3639,7 @@ def list_jobs(option_list: list):
 
 
 list_jobs_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
+    PROJECT_ID_OPTION,
     Option(
         "start",
         ["--start", "-s"],