Feature/df 423.update pydantic version (#16)

* DF-423: add pydantic version and text replace * DF-423: carret for version --------- Co-authored-by: Sebastian Lacki <[email protected]>
finbourne · Apr 10, 2024 · 4ccce27 · 4ccce27
1 parent 8491fd6
commit 4ccce27
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/generate/generate.sh b/generate/generate.sh
@@ -95,6 +95,15 @@ do
     echo "$new_contents" > $file
 done
 
+# list all API files, and text replace. Workaround until we start using pydantic directly with OpenApi generator
+api_files=$(find $sdk_output_folder/$app_name/api -type f -maxdepth 1)
+for file in $api_files
+do
+   # replace "from pydantic import" with "from pydantic.v1 import"
+  new_contents=$(sed 's/from pydantic import/from pydantic.v1 import/' $file)
+  echo "$new_contents" > $file
+done
+
 (
     cd $sdk_output_folder;
     poetry install;

diff --git a/generate/templates/model_generic.mustache b/generate/templates/model_generic.mustache
@@ -5,7 +5,7 @@ import json
 
 {{#vendorExtensions.x-py-datetime-imports}}{{#-first}}from datetime import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-datetime-imports}}
 {{#vendorExtensions.x-py-typing-imports}}{{#-first}}from typing import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-typing-imports}}
-{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
+{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic.v1 import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
 {{#vendorExtensions.x-py-model-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-model-imports}}

diff --git a/generate/templates/pyproject.mustache b/generate/templates/pyproject.mustache
@@ -28,7 +28,7 @@ tornado = "^4.2"
 pem = "^19.3.0"
 pycryptodome = "^3.9.0"
 {{/hasHttpSignatureMethods}}
-pydantic = "^1.10.5"
+pydantic = "^2.6.3"
 aenum = "^3.1.11"
 
 [tool.poetry.dev-dependencies]