u2d-ai · eduard-terletskiy · Sep 11, 2023 · Sep 13, 2023 · Sep 18, 2023 · Sep 18, 20 8000 23
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,17 +1,21 @@
 # msaDocModels Release Notes
 ## Possible future features:
 
+# 0.0.101
+
+- added supporting pydantic v2
+
 # 0.0.100
 
-- add Input and DTO models for Spellcheck 
+- add Input and DTO models for Spellcheck
 
 # 0.0.98
 
-- fix algorithm to DocClassifier Input 
+- fix algorithm to DocClassifier Input
 
 # 0.0.97
 
-- add algorithm to DocClassifier Input 
+- add algorithm to DocClassifier Input
 - change dto model for DocClassifier
 
 # 0.0.96

diff --git a/docs/saved_req_package_pip_info.pkl b/docs/saved_req_package_pip_info.pkl
diff --git a/msaDocModels/__init__.py b/msaDocModels/__init__.py
@@ -1,7 +1,7 @@
 import glob
 from os.path import basename, dirname, isfile, join
 
-version = "0.0.100"
+version = "0.0.101"
 __author__ = "Stefan Welcker"
 __copyright__ = "Copyright 2022, U2D.ai"
 __license__ = "MIT"

diff --git a/msaDocModels/health.py b/msaDocModels/health.py
@@ -19,5 +19,5 @@ class MSAHealthMessage(BaseModel):
     """Health Pydantic Response Service Message"""
 
     healthy: bool = False
-    message: Optional[str]
-    error: Optional[str]
+    message: Optional[str] = None
+    error: Optional[str] = None
diff --git a/msaDocModels/msg.py b/msaDocModels/msg.py
@@ -1,11 +1,15 @@
 import datetime
-from typing import TypeVar
+import uuid
+from typing import List, Optional, TypeVar
 
+from fastapi.encoders import jsonable_encoder
 from genson import SchemaBuilder
+from pydantic import BaseModel
 from pydantic.types import UUID
 
 _T = TypeVar("_T")
 
+
 try:
     import orjson as json
 except:
@@ -18,13 +22,6 @@
         json.__version__ = ""
 
 
-import uuid
-from typing import List, Optional
-
-from fastapi.encoders import jsonable_encoder
-from pydantic import BaseModel
-
-
 class titem(BaseModel):
     item_me: str = "Stefan"
 
@@ -64,9 +61,8 @@ def toMsg(self) -> str:
         classes = {}
         for k, v in self.__dict__.items():
             classes[k] = v.__class__.__name__
-            # print("TOMSG:",k,v, type(v), v.__class__.__name__)
         self.__dict__["classes"] = classes
-        return json.dumps(self, default=lambda x: jsonable_encoder(x.__dict__)).decode("utf8").replace("'", '"')
+        return json.dumps(self, default=lambda x: jsonable_encoder(x.__dict__)).replace("'", '"')
 
     def fromMsg(self, message: str):
         self.__dict__ = json.loads(message)

diff --git a/msaDocModels/pubsub.py b/msaDocModels/pubsub.py
@@ -1,10 +1,10 @@
 from enum import Enum
 from typing import Any, Dict
 
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
 
 
-class UpdateStatusTypes(Enum):
+class UpdateStatusTypes(str, Enum):
     """
     Enum Class that represents choices for statuses in pubsub message.
     """
@@ -28,7 +28,7 @@ class DatabaseUpdateMessageDTO(BaseModel):
     type: str
     entry: Dict[str, Any]
 
-    @validator("type")
+    @field_validator("type")
     def validate_notification_type(cls, _type: str):
         available_types = [attr.value for attr in UpdateStatusTypes]
         if _type in available_types:

diff --git a/msaDocModels/scheduler.py b/msaDocModels/scheduler.py
@@ -45,18 +45,18 @@ class MSASchedulerTaskDetail(BaseModel):
     force_run: bool
     force_termination: bool
     status: str
-    timeout: Optional[Union[str, int, datetime.timedelta]]
+    timeout: Optional[Union[str, int, datetime.timedelta]] = None
     parameters: Any
     start_cond: Any
     end_cond: Any
     on_startup: bool
     on_shutdown: bool
-    last_run: Optional[datetime.datetime]
-    last_success: Optional[datetime.datetime]
-    last_fail: Optional[datetime.datetime]
-    last_terminate: Optional[datetime.datetime]
-    last_inaction: Optional[datetime.datetime]
-    last_crash: Optional[datetime.datetime]
+    last_run: Optional[datetime.datetime] = None
+    last_success: Optional[datetime.datetime] = None
+    last_fail: Optional[datetime.datetime] = None
+    last_terminate: Optional[datetime.datetime] = None
+    last_inaction: Optional[datetime.datetime] = None
+    last_crash: Optional[datetime.datetime] = None
     func: Any
     path: Any
     func_name: str