Merge branch 'kubeflow:main' into mcp_tests

Author: dbasunag

.gitattributes

@@ -35,18 +35,24 @@ catalog/clients/python/src/catalog_openapi/models/filter_option.py linguist-gene
 catalog/clients/python/src/catalog_openapi/models/filter_option_range.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/filter_options_list.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_artifact.py linguist-generated=true
+catalog/clients/python/src/catalog_openapi/models/mcp_config_map_key.py linguist-generated=true
+catalog/clients/python/src/catalog_openapi/models/mcp_config_map_requirement.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_endpoints.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_env_var_metadata.py linguist-generated=true
+catalog/clients/python/src/catalog_openapi/models/mcp_prerequisites.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_resource_recommendation.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_resource_recommendation_high.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_resource_recommendation_minimal.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_resource_recommendation_recommended.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_runtime_metadata.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_runtime_metadata_capabilities.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_runtime_metadata_health_endpoints.py linguist-generated=true
+catalog/clients/python/src/catalog_openapi/models/mcp_secret_key.py linguist-generated=true
+catalog/clients/python/src/catalog_openapi/models/mcp_secret_requirement.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_security_indicator.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_server.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_server_list.py linguist-generated=true
+catalog/clients/python/src/catalog_openapi/models/mcp_service_account_requirement.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_tool.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_tool_parameter.py linguist-generated=true
 catalog/clients/python/src/catalog_openapi/models/mcp_tool_with_server.py linguist-generated=true

catalog/clients/python/patches/fix-nested-dict-to-dict.patch

@@ -0,0 +1,14 @@
+--- a/catalog/clients/python/src/catalog_openapi/models/filter_options_list.py
++++ b/catalog/clients/python/src/catalog_openapi/models/filter_options_list.py
+@@ -81,7 +81,10 @@
+         # override the default output from pydantic by calling `to_dict()` of each value in named_queries (dict)
+         _field_dict = {}
+         if self.named_queries:
+             for _key_named_queries in self.named_queries:
+                 if self.named_queries[_key_named_queries]:
+-                    _field_dict[_key_named_queries] = self.named_queries[_key_named_queries].to_dict()
++                    _field_dict[_key_named_queries] = {
++                        _ik: _iv.to_dict() if hasattr(_iv, 'to_dict') else _iv
++                        for _ik, _iv in self.named_queries[_key_named_queries].items()
++                    }
+             _dict['namedQueries'] = _field_dict

catalog/clients/python/src/catalog_openapi/__init__.py

@@ -1,5 +1,6 @@
 # flake8: noqa
 
 # import apis into api package
+from catalog_openapi.api.mcp_catalog_service_api import MCPCatalogServiceApi
 from catalog_openapi.api.model_catalog_service_api import ModelCatalogServiceApi