Improvement: Vehicle Model generator as module integration

.github/workflows/ci.yml

@@ -57,6 +57,7 @@ jobs:
         run: |
           pip install -r vehicle-model-lifecycle/src/requirements.txt
           pip install -r vehicle-model-lifecycle/test/requirements.txt
+          python vehicle-model-lifecycle/src/install_deps.py
 
       - name: unit test
         shell: bash

manifest.json

@@ -91,7 +91,7 @@
                 {
                     "name": "modelGeneratorGitRef",
                     "type": "string",
-                    "default": "v0.3.0",
+                    "default": "vehicle-model-generator-improvement",
                     "description": "Git ref of the model generator repo. Can be a tag, branch or SHA"
                 }
             ]

vehicle-model-lifecycle/src/generate_model.py

@@ -18,9 +18,10 @@
 import os
 import shutil
 import subprocess
-import sys
 from pathlib import Path
 
+from sdv.model_generator.main import generate_model  # type: ignore
+
 
 def require_env(name: str) -> str:
     """Require and return an environment variable.
@@ -81,19 +82,8 @@ def invoke_generator(
         f"Invoking model generator for language {output_language} and file "
         f"{vspec_file_path!r}"
     )
-    subprocess.check_call(
-        [
-            sys.executable,
-            "-m",
-            "sdv.model_generator.main",
-            "-l",
-            output_language,
-            "-T",
-            output_path,
-            vspec_file_path,
-        ],
-        cwd=get_workspace_dir(),
-    )
+
+    generate_model(output_language, vspec_file_path, target_folder=output_path)
 
 
 def install_model_if_required(language: str, model_path: str) -> None:
@@ -104,7 +94,7 @@ def install_model_if_required(language: str, model_path: str) -> None:
         model_path (str): The path where the generated model is stored.
     """
     if language == "python":
-        subprocess.check_call([sys.executable, "-m", "pip", "install", model_path])
+        subprocess.check_call(["sys.executable", "-m", "pip", "install", model_path])
 
 
 if __name__ == "__main__":

vehicle-model-lifecycle/src/requirements.txt

@@ -1 +1,2 @@
+types-requests==2.31.0
 requests==2.31.0