fix: datamodel-codegen on unix

OpenSemanticLab · Oct 22, 2023 · 25b5f93 · 25b5f93
1 parent 7bd4a2a
commit 25b5f93
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/osw/core.py b/src/osw/core.py
@@ -372,20 +372,22 @@ def _fetch_schema(self, fetchSchemaParam: _FetchSchemaParam = None) -> None:
         temp_model_path = os.path.join(model_dir_path, "temp.py")
         if root:
             exec_name = "datamodel-codegen"
+            # default: assume datamodel-codegen is in PATH
+            exec_path = exec_name
             if platform.system() == "Windows":
                 exec_name += ".exe"
-            exec_path = os.path.join(
-                os.path.dirname(os.path.abspath(sys.executable)), exec_name
-            )
-            if not os.path.isfile(exec_path):
                 exec_path = os.path.join(
-                    os.path.dirname(os.path.abspath(sys.executable)),
-                    "Scripts",
-                    exec_name,
+                    os.path.dirname(os.path.abspath(sys.executable)), exec_name
                 )
-            if not os.path.isfile(exec_path):
-                print("Error: datamodel-codegen not found")
-                return
+                if not os.path.isfile(exec_path):
+                    exec_path = os.path.join(
+                        os.path.dirname(os.path.abspath(sys.executable)),
+                        "Scripts",
+                        exec_name,
+                    )
+                if not os.path.isfile(exec_path):
+                    print("Error: datamodel-codegen not found")
+                    return
             os.system(
                 f"{exec_path}  \
                 --input {schema_path} \