From be9e83efbb60b36a765f1a6e26b11f2fedd536a5 Mon Sep 17 00:00:00 2001 From: Mark Kurtz Date: Wed, 17 Jul 2024 18:47:07 -0400 Subject: [PATCH 1/2] Add config overrides for protected namespaces to remove warnings for pydantic classes that have model_* params --- src/deepsparse/pipeline_config.py | 7 ++++++- src/deepsparse/server/server.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/deepsparse/pipeline_config.py b/src/deepsparse/pipeline_config.py index 3af9a82dd8..57bf07fa97 100644 --- a/src/deepsparse/pipeline_config.py +++ b/src/deepsparse/pipeline_config.py @@ -14,7 +14,7 @@ from typing import Any, Dict, List, Optional -from pydantic import BaseModel, Field +from pydantic import BaseModel, Field, ConfigDict from deepsparse.operators.engine_operator import DEEPSPARSE_ENGINE @@ -84,3 +84,8 @@ class PipelineConfig(BaseModel): "into the pipeline as kwargs" ), ) + + # override name spaces due to model_ warnings in pydantic 2.X + model_config = ConfigDict( + protected_namespaces=() + ) diff --git a/src/deepsparse/server/server.py b/src/deepsparse/server/server.py index 0c52efc508..1eff41f917 100644 --- a/src/deepsparse/server/server.py +++ b/src/deepsparse/server/server.py @@ -20,7 +20,7 @@ from typing import AsyncGenerator, List, Optional, Union import yaml -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict import uvicorn from deepsparse.benchmark.benchmark_pipeline import benchmark_from_pipeline @@ -52,6 +52,11 @@ class CheckReady(BaseModel): class ModelMetaData(BaseModel): model_path: str + # override name spaces due to model_ warnings in pydantic 2.X + model_config = ConfigDict( + protected_namespaces=() + ) + # For deepsparse endpoints, we bind the `predict`` and `predict_from_files` functions to # each of the added routes. As we require access to the pipeline to run inference on From b8ac185cd85b463c24080a6c0cbd7ca5d355d709 Mon Sep 17 00:00:00 2001 From: Mark Kurtz Date: Wed, 17 Jul 2024 18:48:12 -0400 Subject: [PATCH 2/2] make quality --- src/deepsparse/pipeline_config.py | 6 ++---- src/deepsparse/server/server.py | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/deepsparse/pipeline_config.py b/src/deepsparse/pipeline_config.py index 57bf07fa97..f76ba071d4 100644 --- a/src/deepsparse/pipeline_config.py +++ b/src/deepsparse/pipeline_config.py @@ -14,7 +14,7 @@ from typing import Any, Dict, List, Optional -from pydantic import BaseModel, Field, ConfigDict +from pydantic import BaseModel, ConfigDict, Field from deepsparse.operators.engine_operator import DEEPSPARSE_ENGINE @@ -86,6 +86,4 @@ class PipelineConfig(BaseModel): ) # override name spaces due to model_ warnings in pydantic 2.X - model_config = ConfigDict( - protected_namespaces=() - ) + model_config = ConfigDict(protected_namespaces=()) diff --git a/src/deepsparse/server/server.py b/src/deepsparse/server/server.py index 1eff41f917..ca9b17caed 100644 --- a/src/deepsparse/server/server.py +++ b/src/deepsparse/server/server.py @@ -53,9 +53,7 @@ class ModelMetaData(BaseModel): model_path: str # override name spaces due to model_ warnings in pydantic 2.X - model_config = ConfigDict( - protected_namespaces=() - ) + model_config = ConfigDict(protected_namespaces=()) # For deepsparse endpoints, we bind the `predict`` and `predict_from_files` functions to