pygeai 0.4.0b4__py3-none-any.whl → 0.4.0b6__py3-none-any.whl

pygeai/cli/commands/lab/ai_lab.py

@@ -25,7 +25,6 @@ def show_help():
 
 
 def list_agents(option_list: list):
-    project_id = None
     status = ""
     start = ""
     count = ""
@@ -34,8 +33,6 @@ def list_agents(option_list: list):
     allow_external = False
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "status":
             status = option_arg
         if option_flag.name == "start":
@@ -49,12 +46,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()
     result = client.list_agents(
-        project_id=project_id,
         status=status,
         start=start,
         count=count,
@@ -66,12 +59,6 @@ def list_agents(option_list: list):
 
 
 list_agents_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "status",
         ["--status"],
@@ -112,7 +99,6 @@ list_agents_options = [
 
 
 def create_agent(option_list: list):
-    project_id = None
     name = None
     access_scope = None
     public_name = None
@@ -128,13 +114,12 @@ 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
 
     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 == "access_scope":
@@ -202,6 +187,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 +205,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")
 
@@ -248,7 +233,6 @@ def create_agent(option_list: list):
 
     client = AgentClient()
     result = client.create_agent(
-        project_id=project_id,
         name=name,
         access_scope=access_scope,
         public_name=public_name,
@@ -257,6 +241,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 +250,6 @@ 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
-    ),
     Option(
         "name",
         ["--name", "-n"],
@@ -362,6 +341,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"],
@@ -385,15 +370,12 @@ create_agent_options = [
 
 
 def get_agent(option_list: list):
-    project_id = None
     agent_id = None
     revision = 0
     version = 0
     allow_drafts = True
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "agent_id":
             agent_id = option_arg
         if option_flag.name == "revision":
@@ -403,12 +385,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()
     result = client.get_agent(
-        project_id=project_id,
         agent_id=agent_id,
         revision=revision,
         version=version,
@@ -418,12 +399,6 @@ def get_agent(option_list: list):
 
 
 get_agent_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -452,25 +427,20 @@ get_agent_options = [
 
 
 def export_agent(option_list: list):
-    project_id = None
     agent_id = None
     file = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "agent_id":
             agent_id = option_arg
         if option_flag.name == "file":
             file = 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()
     result = client.export_agent(
-        project_id=project_id,
         agent_id=agent_id,
     )
     if file:
@@ -488,12 +458,6 @@ def export_agent(option_list: list):
 
 
 export_agent_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -510,18 +474,15 @@ export_agent_options = [
 
 
 def import_agent(option_list: list):
-    project_id = None
     file = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "file":
             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:
@@ -532,7 +493,6 @@ def import_agent(option_list: list):
 
     client = AgentClient()
     result = client.import_agent(
-        project_id=project_id,
         data=agent_data
     )
 
@@ -541,12 +501,6 @@ def import_agent(option_list: list):
 
 
 import_agent_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "file",
         ["--file", "-f"],
@@ -557,33 +511,23 @@ import_agent_options = [
 
 
 def create_sharing_link(option_list: list):
-    project_id = None
     agent_id = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         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()
     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
-    ),
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -594,24 +538,20 @@ create_sharing_link_options = [
 
 
 def publish_agent_revision(option_list: list):
-    project_id = None
     agent_id = None
     revision = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "agent_id":
             agent_id = option_arg
         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()
     result = client.publish_agent_revision(
-        project_id=project_id,
         agent_id=agent_id,
         revision=revision
     )
@@ -619,12 +559,6 @@ def publish_agent_revision(option_list: list):
 
 
 publish_agent_revision_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -641,33 +575,23 @@ publish_agent_revision_options = [
 
 
 def delete_agent(option_list: list):
-    project_id = None
     agent_id = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         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()
     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
-    ),
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -678,7 +602,6 @@ delete_agent_options = [
 
 
 def update_agent(option_list: list):
-    project_id = None
     agent_id = None
     name = None
     access_scope = None
@@ -695,14 +618,13 @@ 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
     upsert = False
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "agent_id":
             agent_id = option_arg
         if option_flag.name == "name":
@@ -771,7 +693,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 +714,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")
 
@@ -821,7 +742,6 @@ def update_agent(option_list: list):
 
     client = AgentClient()
     result = client.update_agent(
-        project_id=project_id,
         agent_id=agent_id,
         name=name,
         access_scope=access_scope,
@@ -831,6 +751,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 +761,6 @@ 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
-    ),
     Option(
         "agent_id",
         ["--agent-id", "--aid"],
@@ -943,6 +858,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"],
@@ -973,7 +894,6 @@ update_agent_options = [
 
 
 def create_tool(option_list: list):
-    project_id = None
     name = None
     description = None
     scope = None
@@ -987,8 +907,6 @@ def create_tool(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 == "description":
@@ -1030,8 +948,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:
@@ -1045,7 +961,6 @@ def create_tool(option_list: list):
 
     client = ToolClient()
     result = client.create_tool(
-        project_id=project_id,
         name=name,
         description=description,
         scope=scope,
@@ -1062,12 +977,6 @@ 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
-    ),
     Option(
         "name",
         ["--name", "-n"],
@@ -1138,7 +1047,6 @@ create_tool_options = [
 
 
 def list_tools(option_list: list):
-    project_id = None
     id = ""
     count = "100"
     access_scope = "public"
@@ -1147,8 +1055,6 @@ def list_tools(option_list: list):
     allow_external = True
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "id":
             id = option_arg
         if option_flag.name == "count":
@@ -1162,15 +1068,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()
     result = client.list_tools(
-        project_id=project_id,
         id=id,
         count=count,
         access_scope=access_scope,
@@ -1182,12 +1084,6 @@ def list_tools(option_list: list):
 
 
 list_tools_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "id",
         ["--id"],
@@ -1228,15 +1124,12 @@ list_tools_options = [
 
 
 def get_tool(option_list: list):
-    project_id = None
     tool_id = None
     revision = 0
     version = 0
     allow_drafts = True
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "tool_id":
             tool_id = option_arg
         if option_flag.name == "revision":
@@ -1246,12 +1139,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()
     result = client.get_tool(
-        project_id=project_id,
         tool_id=tool_id,
         revision=revision,
         version=version,
@@ -1261,12 +1153,6 @@ def get_tool(option_list: list):
 
 
 get_tool_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1295,25 +1181,21 @@ get_tool_options = [
 
 
 def export_tool(option_list: list):
-    project_id = None
     tool_id = None
     file = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "tool_id":
             tool_id = option_arg
         if option_flag.name == "file":
             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()
     result = client.export_tool(
-        project_id=project_id,
         tool_id=tool_id,
     )
     Console.write_stdout(f"Tool spec: \n{result}")
@@ -1330,12 +1212,6 @@ def export_tool(option_list: list):
 
 
 export_tool_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1353,24 +1229,20 @@ export_tool_options = [
 
 
 def delete_tool(option_list: list):
-    project_id = None
     tool_id = None
     tool_name = None
 
     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()
     result = client.delete_tool(
-        project_id=project_id,
         tool_id=tool_id,
         tool_name=tool_name
     )
@@ -1378,12 +1250,6 @@ def delete_tool(option_list: list):
 
 
 delete_tool_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1400,7 +1266,6 @@ delete_tool_options = [
 
 
 def update_tool(option_list: list):
-    project_id = None
     tool_id = None
     name = None
     description = None
@@ -1416,8 +1281,6 @@ def update_tool(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 == "tool_id":
             tool_id = option_arg
         if option_flag.name == "name":
@@ -1463,8 +1326,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:
@@ -1478,7 +1339,6 @@ def update_tool(option_list: list):
 
     client = ToolClient()
     result = client.update_tool(
-        project_id=project_id,
         tool_id=tool_id,
         name=name,
         description=description,
@@ -1497,12 +1357,6 @@ def update_tool(option_list: list):
 
 
 update_tool_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "Unique identifier of the project containing the tool",
-        True
-    ),
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1585,24 +1439,20 @@ update_tool_options = [
 
 
 def publish_tool_revision(option_list: list):
-    project_id = None
     tool_id = None
     revision = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "tool_id":
             tool_id = option_arg
         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()
     result = client.publish_tool_revision(
-        project_id=project_id,
         tool_id=tool_id,
         revision=revision
     )
@@ -1610,12 +1460,6 @@ def publish_tool_revision(option_list: list):
 
 
 publish_tool_revision_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1632,7 +1476,6 @@ publish_tool_revision_options = [
 
 
 def get_parameter(option_list: list):
-    project_id = None
     tool_id = None
     tool_public_name = None
     allow_drafts = True
@@ -1640,8 +1483,6 @@ def get_parameter(option_list: list):
     version = 0
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "tool_id":
             tool_id = option_arg
         if option_flag.name == "tool_public_name":
@@ -1653,12 +1494,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()
     result = client.get_parameter(
-        project_id=project_id,
         tool_id=tool_id,
         tool_public_name=tool_public_name,
         revision=revision,
@@ -1669,12 +1509,6 @@ def get_parameter(option_list: list):
 
 
 get_parameter_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1709,14 +1543,11 @@ get_parameter_options = [
 
 
 def set_parameter(option_list: list):
-    project_id = None
     tool_public_name = None
     tool_id = None
     parameters = list()
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "tool_id":
             tool_id = option_arg
         if option_flag.name == "tool_public_name":
@@ -1736,8 +1567,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:
@@ -1747,7 +1576,6 @@ def set_parameter(option_list: list):
 
     client = ToolClient()
     result = client.set_parameter(
-        project_id=project_id,
         tool_id=tool_id,
         tool_public_name=tool_public_name,
         parameters=tool_parameters
@@ -1756,12 +1584,6 @@ def set_parameter(option_list: list):
 
 
 set_parameter_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "tool_id",
         ["--tool-id", "--tid"],
@@ -1860,7 +1682,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 +1690,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 +1712,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 +1731,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 +1742,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 +1784,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 +1794,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 +1821,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 +1840,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 +1853,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 +1907,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 +1928,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"],
@@ -2161,7 +1947,6 @@ get_reasoning_strategy_options = [
 
 
 def create_process(option_list: list):
-    project_id = None
     key = None
     name = None
     description = None
@@ -2175,8 +1960,6 @@ def create_process(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 == "key":
             key = option_arg
         if option_flag.name == "name":
@@ -2264,8 +2047,6 @@ 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:
@@ -2273,7 +2054,6 @@ def create_process(option_list: list):
 
     client = AgenticProcessClient()
     result = client.create_process(
-        project_id=project_id,
         key=key,
         name=name,
         description=description,
@@ -2290,12 +2070,6 @@ def create_process(option_list: list):
 
 
 create_process_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "key",
         ["--key", "-k"],
@@ -2380,7 +2154,6 @@ create_process_options = [
 
 
 def update_process(option_list: list):
-    project_id = None
     process_id = None
     name = None
     key = None
@@ -2396,8 +2169,6 @@ def update_process(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 == "process_id":
             process_id = option_arg
         if option_flag.name == "name":
@@ -2489,14 +2260,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()
     result = client.update_process(
-        project_id=project_id,
         process_id=process_id,
         name=name,
         key=key,
@@ -2515,12 +2283,6 @@ def update_process(option_list: list):
 
 
 update_process_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -2617,7 +2379,6 @@ update_process_options = [
 
 
 def get_process(option_list: list):
-    project_id = None
     process_id = None
     process_name = None
     revision = "0"
@@ -2625,8 +2386,6 @@ def get_process(option_list: list):
     allow_drafts = True
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "process_id":
             process_id = option_arg
         if option_flag.name == "process_name":
@@ -2638,14 +2397,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()
     result = client.get_process(
-        project_id=project_id,
         process_id=process_id,
         process_name=process_name,
         revision=revision,
@@ -2656,12 +2412,6 @@ def get_process(option_list: list):
 
 
 get_process_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -2696,7 +2446,6 @@ get_process_options = [
 
 
 def list_processes(option_list: list):
-    project_id = None
     id = None
     name = None
     status = None
@@ -2705,8 +2454,6 @@ def list_processes(option_list: list):
     allow_draft = True
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "id":
             id = option_arg
         if option_flag.name == "name":
@@ -2720,12 +2467,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()
     result = client.list_processes(
-        project_id=project_id,
         id=id,
         name=name,
         status=status,
@@ -2737,12 +2480,6 @@ def list_processes(option_list: list):
 
 
 list_processes_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "id",
         ["--id"],
@@ -2783,15 +2520,12 @@ list_processes_options = [
 
 
 def list_processes_instances(option_list: list):
-    project_id = None
     process_id = None
     is_active = True
     start = "0"
     count = "10"
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "process_id":
             process_id = option_arg
         if option_flag.name == "is_active":
@@ -2801,14 +2535,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()
     result = client.list_process_instances(
-        project_id=project_id,
         process_id=process_id,
         is_active=is_active,
         start=start,
@@ -2818,12 +2549,6 @@ def list_processes_instances(option_list: list):
 
 
 list_processes_instances_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -2852,26 +2577,20 @@ list_processes_instances_options = [
 
 
 def delete_process(option_list: list):
-    project_id = None
     process_id = None
     process_name = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "process_id":
             process_id = option_arg
         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()
     result = client.delete_process(
-        project_id=project_id,
         process_id=process_id,
         process_name=process_name
     )
@@ -2879,12 +2598,6 @@ def delete_process(option_list: list):
 
 
 delete_process_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -2901,14 +2614,11 @@ delete_process_options = [
 
 
 def publish_process_revision(option_list: list):
-    project_id = None
     process_id = None
     process_name = None
     revision = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "process_id":
             process_id = option_arg
         if option_flag.name == "process_name":
@@ -2916,8 +2626,6 @@ 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:
@@ -2925,7 +2633,6 @@ def publish_process_revision(option_list: list):
 
     client = AgenticProcessClient()
     result = client.publish_process_revision(
-        project_id=project_id,
         process_id=process_id,
         process_name=process_name,
         revision=revision
@@ -2934,12 +2641,6 @@ def publish_process_revision(option_list: list):
 
 
 publish_process_revision_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "process_id",
         ["--process-id", "--pid"],
@@ -2965,7 +2666,6 @@ publish_process_revision_options = [
 
 
 def create_task(option_list: list):
-    project_id = None
     name = None
     description = None
     title_template = None
@@ -2975,8 +2675,6 @@ def create_task(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 == "description":
@@ -3002,14 +2700,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()
     result = client.create_task(
-        project_id=project_id,
         name=name,
         description=description,
         title_template=title_template,
@@ -3022,12 +2717,6 @@ def create_task(option_list: list):
 
 
 create_task_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "name",
         ["--name", "-n"],
@@ -3074,26 +2763,20 @@ create_task_options = [
 
 
 def get_task(option_list: list):
-    project_id = None
     task_id = None
     task_name = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "task_id":
             task_id = option_arg
         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()
     result = client.get_task(
-        project_id=project_id,
         task_id=task_id,
         task_name=task_name
     )
@@ -3101,12 +2784,6 @@ def get_task(option_list: list):
 
 
 get_task_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "task_id",
         ["--task-id", "--tid"],
@@ -3123,15 +2800,12 @@ get_task_options = [
 
 
 def list_tasks(option_list: list):
-    project_id = None
     id = None
     start = "0"
     count = "100"
     allow_drafts = True
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "id":
             id = option_arg
         if option_flag.name == "start":
@@ -3141,12 +2815,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()
     result = client.list_tasks(
-        project_id=project_id,
         id=id,
         start=start,
         count=count,
@@ -3156,12 +2826,6 @@ def list_tasks(option_list: list):
 
 
 list_tasks_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "id",
         ["--id"],
@@ -3190,7 +2854,6 @@ list_tasks_options = [
 
 
 def update_task(option_list: list):
-    project_id = None
     task_id = None
     name = None
     description = None
@@ -3202,8 +2865,6 @@ def update_task(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 == "task_id":
             task_id = option_arg
         if option_flag.name == "name":
@@ -3233,14 +2894,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()
     result = client.update_task(
-        project_id=project_id,
         task_id=task_id,
         name=name,
         description=description,
@@ -3255,12 +2913,6 @@ def update_task(option_list: list):
 
 
 update_task_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "task_id",
         ["--task-id", "--tid"],
@@ -3319,26 +2971,20 @@ update_task_options = [
 
 
 def delete_task(option_list: list):
-    project_id = None
     task_id = None
     task_name = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "task_id":
             task_id = option_arg
         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()
     result = client.delete_task(
-        project_id=project_id,
         task_id=task_id,
         task_name = task_name
     )
@@ -3346,12 +2992,6 @@ def delete_task(option_list: list):
 
 
 delete_task_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "task_id",
         ["--task-id", "--tid"],
@@ -3368,14 +3008,11 @@ delete_task_options = [
 
 
 def publish_task_revision(option_list: list):
-    project_id = None
     task_id = None
     task_name = None
     revision = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "task_id":
             task_id = option_arg
         if option_flag.name == "task_name":
@@ -3383,8 +3020,6 @@ 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:
@@ -3392,7 +3027,6 @@ def publish_task_revision(option_list: list):
 
     client = AgenticProcessClient()
     result = client.publish_task_revision(
-        project_id=project_id,
         task_id=task_id,
         task_name=task_name,
         revision=revision
@@ -3401,12 +3035,6 @@ def publish_task_revision(option_list: list):
 
 
 publish_task_revision_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "task_id",
         ["--task-id", "--tid"],
@@ -3430,14 +3058,11 @@ publish_task_revision_options = [
 
 # RUNTIME - Process instances
 def start_instance(option_list: list):
-    project_id = None
     process_name = None
     subject = None
     variables = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "process_name":
             process_name = option_arg
         if option_flag.name == "subject":
@@ -3452,14 +3077,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()
     result = client.start_instance(
-        project_id=project_id,
         process_name=process_name,
         subject=subject,
         variables=variables
@@ -3468,12 +3090,6 @@ def start_instance(option_list: list):
 
 
 start_instance_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "process_name",
         ["--process-name", "--pn"],
@@ -3496,35 +3112,23 @@ start_instance_options = [
 
 
 def abort_instance(option_list: list):
-    project_id = None
     instance_id = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         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()
     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
-    ),
     Option(
         "instance_id",
         ["--instance-id", "--iid"],
@@ -3535,35 +3139,23 @@ abort_instance_options = [
 
 
 def get_instance(option_list: list):
-    project_id = None
     instance_id = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         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()
     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
-    ),
     Option(
         "instance_id",
         ["--instance-id", "--iid"],
@@ -3574,35 +3166,23 @@ get_instance_options = [
 
 
 def get_instance_history(option_list: list):
-    project_id = None
     instance_id = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         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()
     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
-    ),
     Option(
         "instance_id",
         ["--instance-id", "--iid"],
@@ -3612,35 +3192,23 @@ get_instance_history_options = [
 ]
 
 def get_thread_information(option_list: list):
-    project_id = None
     thread_id = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         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()
     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
-    ),
     Option(
         "thread_id",
         ["--thread-id", "--tid"],
@@ -3651,20 +3219,15 @@ get_thread_information_options = [
 
 
 def send_user_signal(option_list: list):
-    project_id = None
     instance_id = None
     signal_name = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "instance_id":
             instance_id = option_arg
         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:
@@ -3672,7 +3235,6 @@ def send_user_signal(option_list: list):
 
     client = AgenticProcessClient()
     result = client.send_user_signal(
-        project_id=project_id,
         instance_id=instance_id,
         signal_name=signal_name
     )
@@ -3680,12 +3242,6 @@ def send_user_signal(option_list: list):
 
 
 send_user_signal_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "instance_id",
         ["--instance-id", "--iid"],
@@ -3704,14 +3260,11 @@ send_user_signal_options = [
 
 
 def create_kb(option_list: list):
-    project_id = None
     name = None
     artifacts = None
     metadata = None
 
     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 == "artifacts":
@@ -3733,14 +3286,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()
     result = client.create_kb(
-        project_id=project_id,
         name=name,
         artifacts=artifacts,
         metadata=metadata
@@ -3749,12 +3299,6 @@ def create_kb(option_list: list):
 
 
 create_kb_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "name",
         ["--name", "-n"],
@@ -3777,26 +3321,20 @@ create_kb_options = [
 
 
 def get_kb(option_list: list):
-    project_id = None
     kb_id = None
     kb_name = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "kb_id":
             kb_id = option_arg
         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()
     result = client.get_kb(
-        project_id=project_id,
         kb_id=kb_id,
         kb_name=kb_name
     )
@@ -3804,12 +3342,6 @@ def get_kb(option_list: list):
 
 
 get_kb_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "kb_id",
         ["--kb-id", "--kid"],
@@ -3826,14 +3358,11 @@ get_kb_options = [
 
 
 def list_kbs(option_list: list):
-    project_id = None
     name = None
     start = "0"
     count = "100"
 
     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 == "start":
@@ -3841,12 +3370,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()
     result = client.list_kbs(
-        project_id=project_id,
         name=name,
         start=start,
         count=count
@@ -3855,12 +3380,6 @@ def list_kbs(option_list: list):
 
 
 list_kbs_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "name",
         ["--name", "-n"],
@@ -3883,26 +3402,20 @@ list_kbs_options = [
 
 
 def delete_kb(option_list: list):
-    project_id = None
     kb_id = None
     kb_name = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "kb_id":
             kb_id = option_arg
         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()
     result = client.delete_kb(
-        project_id=project_id,
         kb_id=kb_id,
         kb_name=kb_name
     )
@@ -3910,12 +3423,6 @@ def delete_kb(option_list: list):
 
 
 delete_kb_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "kb_id",
         ["--kb-id", "--kid"],
@@ -3934,7 +3441,6 @@ delete_kb_options = [
 
 
 def list_jobs(option_list: list):
-    project_id = None
     start = "0"
     count = "100"
     topic = None
@@ -3942,8 +3448,6 @@ def list_jobs(option_list: list):
     name = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
         if option_flag.name == "start":
             start = option_arg
         if option_flag.name == "count":
@@ -3955,12 +3459,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()
     result = client.list_jobs(
-        project_id=project_id,
         start=start,
         count=count,
         topic=topic,
@@ -3971,12 +3471,6 @@ def list_jobs(option_list: list):
 
 
 list_jobs_options = [
-    Option(
-        "project_id",
-        ["--project-id", "--pid"],
-        "ID of the project",
-        True
-    ),
     Option(
         "start",
         ["--start", "-s"],