feat chaotic: fixes for clients

commit_hash:30a607a5023518ae57d881a396c51897f18bf023

Author: segoon

.mapping.json

@@ -89,14 +89,14 @@
   "chaotic-openapi/include/userver/chaotic/openapi/client/exceptions.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/client/exceptions.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/client/middleware.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/client/middleware.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/client/middleware_factory.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/client/middleware_factory.hpp",
-  "chaotic-openapi/include/userver/chaotic/openapi/client/middleware_registry.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/client/middleware_registry.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/form.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/form.hpp",
+  "chaotic-openapi/include/userver/chaotic/openapi/middlewares/component_list.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/middlewares/component_list.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/middlewares/follow_redirects_middleware.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/middlewares/follow_redirects_middleware.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/middlewares/logging_middleware.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/middlewares/logging_middleware.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/middlewares/manager.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/middlewares/manager.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/middlewares/proxy_middleware.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/middlewares/proxy_middleware.hpp",
+  "chaotic-openapi/include/userver/chaotic/openapi/middlewares/qos_middleware.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/middlewares/qos_middleware.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/middlewares/ssl_middleware.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/middlewares/ssl_middleware.hpp",
-  "chaotic-openapi/include/userver/chaotic/openapi/middlewares/timeout_retry_middleware.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/middlewares/timeout_retry_middleware.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/parameters.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/parameters.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/parameters_read.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/parameters_read.hpp",
   "chaotic-openapi/include/userver/chaotic/openapi/parameters_write.hpp":"taxi/uservices/userver/chaotic-openapi/include/userver/chaotic/openapi/parameters_write.hpp",
@@ -116,14 +116,14 @@
   "chaotic-openapi/src/chaotic/openapi/client/exceptions.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/client/exceptions.cpp",
   "chaotic-openapi/src/chaotic/openapi/client/middleware.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/client/middleware.cpp",
   "chaotic-openapi/src/chaotic/openapi/client/middleware_factory.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/client/middleware_factory.cpp",
-  "chaotic-openapi/src/chaotic/openapi/client/middleware_registry.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/client/middleware_registry.cpp",
   "chaotic-openapi/src/chaotic/openapi/form.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/form.cpp",
+  "chaotic-openapi/src/chaotic/openapi/middlewares/component_list.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/middlewares/component_list.cpp",
   "chaotic-openapi/src/chaotic/openapi/middlewares/follow_redirects_middleware.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/middlewares/follow_redirects_middleware.cpp",
   "chaotic-openapi/src/chaotic/openapi/middlewares/logging_middleware.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/middlewares/logging_middleware.cpp",
   "chaotic-openapi/src/chaotic/openapi/middlewares/manager.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/middlewares/manager.cpp",
   "chaotic-openapi/src/chaotic/openapi/middlewares/proxy_middleware.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/middlewares/proxy_middleware.cpp",
+  "chaotic-openapi/src/chaotic/openapi/middlewares/qos_middleware.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/middlewares/qos_middleware.cpp",
   "chaotic-openapi/src/chaotic/openapi/middlewares/ssl_middleware.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/middlewares/ssl_middleware.cpp",
-  "chaotic-openapi/src/chaotic/openapi/middlewares/timeout_retry_middleware.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/middlewares/timeout_retry_middleware.cpp",
   "chaotic-openapi/src/chaotic/openapi/middlewares_test.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/middlewares_test.cpp",
   "chaotic-openapi/src/chaotic/openapi/parameters.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/parameters.cpp",
   "chaotic-openapi/src/chaotic/openapi/parameters_read.cpp":"taxi/uservices/userver/chaotic-openapi/src/chaotic/openapi/parameters_read.cpp",
@@ -3781,6 +3781,7 @@
   "scripts/docs/en/userver/caches.md":"taxi/uservices/userver/scripts/docs/en/userver/caches.md",
   "scripts/docs/en/userver/chaos_testing.md":"taxi/uservices/userver/scripts/docs/en/userver/chaos_testing.md",
   "scripts/docs/en/userver/chaotic.md":"taxi/uservices/userver/scripts/docs/en/userver/chaotic.md",
+  "scripts/docs/en/userver/chaotic_clients.md":"taxi/uservices/userver/scripts/docs/en/userver/chaotic_clients.md",
   "scripts/docs/en/userver/codegen_overview.md":"taxi/uservices/userver/scripts/docs/en/userver/codegen_overview.md",
   "scripts/docs/en/userver/component_system.md":"taxi/uservices/userver/scripts/docs/en/userver/component_system.md",
   "scripts/docs/en/userver/congestion_control.md":"taxi/uservices/userver/scripts/docs/en/userver/congestion_control.md",

chaotic-openapi/chaotic_openapi/back/cpp_client/templates/client_impl.cpp.jinja

@@ -1,8 +1,5 @@
 #include <client/{{ name }}/client_impl.hpp>
 
-#include <userver/chaotic/openapi/client/middleware_registry.hpp>
-#include <userver/chaotic/openapi/middlewares/follow_redirects_middleware.hpp>
-#include <userver/chaotic/openapi/middlewares/timeout_retry_middleware.hpp>
 #include <userver/components/component_context.hpp>
 #include <userver/components/component_base.hpp>
 #include <userver/yaml_config/merge_schemas.hpp>
@@ -15,52 +12,6 @@ ClientImpl::ClientImpl(const USERVER_NAMESPACE::chaotic::openapi::client::Config
 {
 }
 
-USERVER_NAMESPACE::yaml_config::Schema ClientImpl::GetStaticConfigSchema() {
-    std::string base_schema = R"(
-type: object
-description: OpenAPI HTTP client with middlewares
-additionalProperties: false
-properties:
-    base-url:
-        type: string
-        description: Base URL for the API
-    timeout-ms:
-        type: integer
-        description: Request timeout in milliseconds
-        minimum: 1
-    attempts:
-        type: integer
-        description: Maximum number of retry attempts
-        minimum: 1
-    middlewares:
-        type: object
-        description: Middleware configurations
-        additionalProperties: false
-        properties:
-)";
-
-    const auto& registry = USERVER_NAMESPACE::chaotic::openapi::client::MiddlewareRegistry::Instance();
-    const auto& factories = registry.GetFactories();
-    
-    std::string middlewares_yaml = "";
-    for (const auto& [name, factory] : factories) {
-        auto middleware_schema = factory->GetStaticConfigSchemaStr();
-        middlewares_yaml += "            " + name + ":\n";
-        
-        std::string indented_yaml = "";
-        std::string line;
-        std::istringstream schema_stream(middleware_schema);
-        while (std::getline(schema_stream, line)) {
-            indented_yaml += "                " + line + "\n";
-        }
-        middlewares_yaml += indented_yaml;
-    }
-    
-    std::string combined_schema = base_schema + middlewares_yaml;
-    
-    return USERVER_NAMESPACE::yaml_config::MergeSchemas<USERVER_NAMESPACE::components::LoggableComponentBase>(combined_schema);
-}
-
 {% for op in operations %}
   {% if op.client_generate %}
     {{ op.cpp_namespace() }}::Response ClientImpl::{{ op.cpp_method_name() }}(
@@ -70,33 +21,12 @@ properties:
           const USERVER_NAMESPACE::chaotic::openapi::client::CommandControl& command_control
       ) {
         auto r = http_client_.CreateRequest();
-        r.url(config_.base_url + "{{ op.path }}");
+        ApplyConfig(r, command_control, config_);
 
         {% if not op.empty_request() -%}
-        SerializeRequest(request, r);
+        SerializeRequest(request, config_.base_url, r);
         {% endif %}
 
-        if (command_control) { 
-            auto it = middlewares_.find("timeout_retry");
-            if (it != middlewares_.end() && (command_control.timeout.count() > 0 || command_control.attempts > 0)) {
-                auto timeout_retry = std::dynamic_pointer_cast<USERVER_NAMESPACE::chaotic::openapi::TimeoutRetryMiddleware>(it->second);
-                if (timeout_retry) {
-                    timeout_retry->ApplyCommandControl(
-                        command_control.timeout.count() > 0 ? command_control.timeout : config_.timeout,
-                        command_control.attempts > 0 ? command_control.attempts : config_.attempts
-                    );
-                }
-            }
-            
-            it = middlewares_.find("follow_redirects");
-            if (it != middlewares_.end() && command_control.follow_redirects) {
-                auto follow_redirects = std::dynamic_pointer_cast<USERVER_NAMESPACE::chaotic::openapi::FollowRedirectsMiddleware>(it->second);
-                if (follow_redirects) {
-                    follow_redirects->ApplyFollowRedirects(*command_control.follow_redirects);
-                }
-            }
-        }
-        
         middleware_manager_.ProcessRequest(r);
 
         std::shared_ptr<USERVER_NAMESPACE::clients::http::Response> response;

chaotic-openapi/chaotic_openapi/back/cpp_client/templates/component.cpp.jinja

@@ -1,9 +1,10 @@
 #include <client/{{ name }}/component.hpp>
 
 #include <userver/chaotic/openapi/client/config.hpp>
-#include <userver/chaotic/openapi/client/middleware_registry.hpp>
+#include <userver/chaotic/openapi/client/middleware_factory.hpp>
 #include <userver/components/component_context.hpp>
 #include <userver/clients/http/component.hpp>
+#include <userver/yaml_config/merge_schemas.hpp>
 
 namespace {{ namespace }} {
 
@@ -16,14 +17,11 @@ Component::Component(const USERVER_NAMESPACE::components::ComponentConfig& confi
 {
     if (config.HasMember("middlewares")) {
         const auto& mw_config = config["middlewares"];
-        const auto& registry = USERVER_NAMESPACE::chaotic::openapi::client::MiddlewareRegistry::Instance();
-        const auto& factories = registry.GetFactories();
 
-        for (const auto& [name, factory] : factories) {
-            if (mw_config.HasMember(name)) {
-                auto middleware = factory->Create(mw_config[name]);
-                client_.RegisterMiddleware(middleware);
-            }
+        for (const auto& [name, config] : Items(mw_config)) {
+            auto &factory = context.FindComponent<chaotic::openapi::client::MiddlewareFactory>("chaotic-client-middleware-" + name);
+            auto middleware = factory.Create(config);
+            client_.RegisterMiddleware(middleware);
         }
     }
 }
@@ -33,4 +31,32 @@ Client& Component::GetClient()
   return client_;
 }
 
+USERVER_NAMESPACE::yaml_config::Schema Component::GetStaticConfigSchema() {
+    std::string base_schema = R"(
+type: object
+description: OpenAPI HTTP client with middlewares
+additionalProperties: false
+properties:
+    base-url:
+        type: string
+        description: Base URL for the API
+    timeout-ms:
+        type: integer
+        description: Request timeout in milliseconds
+        minimum: 1
+    attempts:
+        type: integer
+        description: Maximum number of retry attempts
+        minimum: 1
+    middlewares:
+        type: object
+        description: Middlewares configuration
+        additionalProperties: true
+        properties: {}
+)";
+
+    return USERVER_NAMESPACE::yaml_config::MergeSchemas<USERVER_NAMESPACE::components::ComponentBase>(base_schema);
+
+}
+
 }

chaotic-openapi/chaotic_openapi/back/cpp_client/templates/component.hpp.jinja

@@ -15,9 +15,7 @@ public:
 
     Client& GetClient();
 
-    static USERVER_NAMESPACE::yaml_config::Schema GetStaticConfigSchema() {
-        return ClientImpl::GetStaticConfigSchema();
-    }
+    static yaml_config::Schema GetStaticConfigSchema();
 
 private:
     ClientImpl client_;

chaotic-openapi/chaotic_openapi/back/cpp_client/templates/requests.cpp.jinja

@@ -25,12 +25,12 @@ namespace openapi = USERVER_NAMESPACE::chaotic::openapi;
     static constexpr openapi::Name k{{ parameter.cpp_name }} = "{{ parameter.raw_name }}";
 {% endfor %}
 
-void SerializeRequest(const Request& request, USERVER_NAMESPACE::clients::http::Request& http_request)
+void SerializeRequest(const Request& request, const std::string& base_url, USERVER_NAMESPACE::clients::http::Request& http_request)
 {
   {# parameters #}
   openapi::ParameterSinkHttpClient sink(
     http_request,
-    "{{ op.path }}"
+    base_url + "{{ op.path }}"
   );
   {% for parameter in op.parameters %}
     {% if parameter.required %}
@@ -69,6 +69,8 @@ void SerializeRequest(const Request& request, USERVER_NAMESPACE::clients::http::
       UASSERT(false);
     }
   {% endif %}
+
+  sink.Flush();
 }
 
 } // namespace

chaotic-openapi/chaotic_openapi/back/cpp_client/templates/requests.hpp.jinja

@@ -60,7 +60,7 @@ namespace {{ namespace }} {
           {% endif %}
         };
 
-        void SerializeRequest(const Request& request, USERVER_NAMESPACE::clients::http::Request& http_request);
+        void SerializeRequest(const Request& request, const std::string& base_url, USERVER_NAMESPACE::clients::http::Request& http_request);
       }
     {%- endif %}
   {% endif %}

chaotic-openapi/golden_tests/output/src/client/test/client_impl.cpp

@@ -1,9 +1,6 @@
 /* THIS FILE IS AUTOGENERATED, DON'T EDIT! */
 #include <client/test/client_impl.hpp>
 
-#include <userver/chaotic/openapi/client/middleware_registry.hpp>
-#include <userver/chaotic/openapi/middlewares/follow_redirects_middleware.hpp>
-#include <userver/chaotic/openapi/middlewares/timeout_retry_middleware.hpp>
 #include <userver/components/component_base.hpp>
 #include <userver/components/component_context.hpp>
 #include <userver/yaml_config/merge_schemas.hpp>

chaotic-openapi/include/userver/chaotic/openapi/client/command_control.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <chrono>
-#include <optional>
 
 #include <userver/chaotic/openapi/client/config.hpp>
 
@@ -12,11 +11,10 @@ namespace chaotic::openapi::client {
 struct CommandControl {
     std::chrono::milliseconds timeout{};
     int attempts{};
-    std::optional<bool> follow_redirects{};
-
-    explicit operator bool() const { return timeout.count() != 0 || attempts != 0 || follow_redirects.has_value(); }
 };
 
+void ApplyConfig(clients::http::Request& request, const CommandControl& cc, const Config& config);
+
 }  // namespace chaotic::openapi::client
 
 USERVER_NAMESPACE_END

chaotic-openapi/include/userver/chaotic/openapi/client/middleware_factory.hpp

@@ -2,15 +2,18 @@
 
 #include <memory>
 #include <userver/chaotic/openapi/client/middleware.hpp>
+#include <userver/components/component_base.hpp>
 #include <userver/components/component_config.hpp>
 #include <userver/yaml_config/schema.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
 namespace chaotic::openapi::client {
 
-class MiddlewareFactory {
+class MiddlewareFactory : public components::ComponentBase {
 public:
+    using components::ComponentBase::ComponentBase;
+
     virtual ~MiddlewareFactory() = default;
 
     virtual std::shared_ptr<Middleware> Create(const USERVER_NAMESPACE::yaml_config::YamlConfig& config) = 0;