fix: fix inherit config

jina/serve/runtimes/gateway/http_fastapi_app_docarrayv2.py

@@ -6,6 +6,7 @@
 from jina.logging.logger import JinaLogger
 from jina.serve.networking.sse import EventSourceResponse
 from jina.types.request.data import DataRequest
+from jina._docarray import is_pydantic_v2
 
 if TYPE_CHECKING:  # pragma: no cover
     from opentelemetry import trace
@@ -80,7 +81,9 @@ async def _shutdown():
     import os
 
     from pydantic import BaseModel
-    from pydantic.config import BaseConfig, inherit_config
+    from pydantic.config import BaseConfig
+    if not is_pydantic_v2:
+        from pydantic.config import inherit_config
 
     from jina.proto import jina_pb2
     from jina.serve.runtimes.gateway.models import (
@@ -275,7 +278,10 @@ async def event_generator():
             parameters_model = input_output_map['parameters'] or Optional[Dict]
             default_parameters = ... if input_output_map['parameters'] else None
 
-            _config = inherit_config(InnerConfig, BaseDoc.__config__)
+            if not is_pydantic_v2:
+                _config = inherit_config(InnerConfig, BaseDoc.__config__)
+            else:
+                _config = InnerConfig
 
             endpoint_input_model = pydantic.create_model(
                 f'{endpoint.strip("/")}_input_model',

jina/serve/runtimes/worker/http_fastapi_app.py

@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Union
 
 from jina import Document, DocumentArray
-from jina._docarray import docarray_v2
+from jina._docarray import docarray_v2, is_pydantic_v2
 from jina.importer import ImportExtensions
 from jina.serve.networking.sse import EventSourceResponse
 from jina.types.request.data import DataRequest
@@ -38,7 +38,9 @@ def get_fastapi_app(
     import os
 
     from pydantic import BaseModel, Field
-    from pydantic.config import BaseConfig, inherit_config
+    from pydantic.config import BaseConfig
+    if not is_pydantic_v2:
+        from pydantic.config import inherit_config
 
     from jina.proto import jina_pb2
     from jina.serve.runtimes.gateway.models import _to_camel_case
@@ -168,7 +170,10 @@ async def streaming_get(request: Request = None, body: input_doc_model = None):
             )
 
             if docarray_v2:
-                _config = inherit_config(InnerConfig, BaseDoc.__config__)
+                if not is_pydantic_v2:
+                    _config = inherit_config(InnerConfig, BaseDoc.__config__)
+                else:
+                    _config = InnerConfig
             else:
                 _config = input_doc_model.__config__
 

jina/serve/runtimes/worker/http_sagemaker_app.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Union
 
-from jina._docarray import docarray_v2
+from jina._docarray import docarray_v2, is_pydantic_v2
 from jina.importer import ImportExtensions
 from jina.types.request.data import DataRequest
 
@@ -33,7 +33,9 @@ def get_fastapi_app(
         from fastapi import FastAPI, HTTPException, Request
         from fastapi.middleware.cors import CORSMiddleware
         from pydantic import BaseModel, Field
-        from pydantic.config import BaseConfig, inherit_config
+        from pydantic.config import BaseConfig
+        if not is_pydantic_v2:
+            from pydantic.config import inherit_config
 
     import os
 
@@ -235,7 +237,11 @@ def construct_model_from_line(
                 ... if input_output_map['parameters']['model'] else None
             )
 
-            _config = inherit_config(InnerConfig, BaseDoc.__config__)
+            if not is_pydantic_v2:
+                _config = inherit_config(InnerConfig, BaseDoc.__config__)
+            else:
+                _config = InnerConfig
+
             endpoint_input_model = pydantic.create_model(
                 f'{endpoint.strip("/")}_input_model',
                 data=(Union[List[input_doc_model], input_doc_model], ...),