chore(sdk): resolve dep relative paths

Author: destifo

typegraph/node/sdk/src/runtimes/python.ts

@@ -9,7 +9,11 @@ import {
 } from "../gen/interfaces/metatype-typegraph-runtimes.js";
 import { Materializer, Runtime } from "./mod.js";
 import { fx } from "../index.js";
-import { getFileHash, getParentDirectories } from "../utils/file_utils.js";
+import {
+  getFileHash,
+  getParentDirectories,
+  getRelativePath,
+} from "../utils/file_utils.js";
 
 interface LambdaMat extends Materializer {
   fn: string;
@@ -113,11 +117,14 @@ export class PythonRuntime extends Runtime {
     const depMetas: ModuleDependencyMeta[] = [];
     for (const dep of deps) {
       const depHash = await getFileHash(dep);
-      const parentDirs = getParentDirectories(dep);
+      const depParentDirs = getParentDirectories(dep);
       const depMeta: ModuleDependencyMeta = {
         path: dep,
         depHash: depHash,
-        relativePathPrefix: parentDirs,
+        relativePathPrefix: getRelativePath(
+          getParentDirectories(module),
+          depParentDirs,
+        ),
       };
       depMetas.push(depMeta);
     }

typegraph/node/sdk/src/utils/file_utils.ts

@@ -50,3 +50,21 @@ export function getParentDirectories(filePath: string) {
   }
   return directories.reverse();
 }
+
+export function getRelativePath(
+  moduleParentDirs: string[],
+  depParentDirs: string[],
+): string[] {
+  let common = 0;
+  let maxLength = Math.min(moduleParentDirs.length, depParentDirs.length);
+
+  for (let i = 0; i < maxLength; i++) {
+    if (moduleParentDirs[i] === depParentDirs[i]) {
+      common += 1;
+    } else {
+      break;
+    }
+  }
+
+  return depParentDirs.slice(common);
+}

typegraph/python/typegraph/graph/tg_artifact_upload.py

@@ -142,7 +142,7 @@ def __upload_artifact_dependencies(self, artifact_hash: str) -> Result[None, Err
         - upload them in parallel 
         
     
-    - serialize(done, not tested) => upload(ts sdk left, not tested) => resolve(done, not tested)
+    - serialize(done, not tested) => upload(done, not tested) => resolve(done, not tested)
     
     - testing left
 

typegraph/python/typegraph/runtimes/python.py

@@ -18,7 +18,7 @@
 )
 from typegraph.gen.types import Err
 from typegraph.runtimes.base import Materializer, Runtime
-from typegraph.utils import get_file_hash, get_parent_directories
+from typegraph.utils import get_file_hash, get_parent_directories, get_relative_path
 from typegraph.wit import runtimes, store
 
 if TYPE_CHECKING:
@@ -107,9 +107,13 @@ def import_(
         dep_metas = []
         for dep in deps:
             dep_hash = get_file_hash(dep)
-            parent_dirs = get_parent_directories(dep)
+            dep_parent_dirs = get_parent_directories(dep)
             dep_meta = ModuleDependencyMeta(
-                path=dep, dep_hash=dep_hash, relative_path_prefix=parent_dirs
+                path=dep,
+                dep_hash=dep_hash,
+                relative_path_prefix=get_relative_path(
+                    get_parent_directories(module), dep_parent_dirs
+                ),
             )
             dep_metas.append(dep_meta)
 
@@ -193,3 +197,4 @@ def visit_Lambda(self, node):
 
     def visit_FunctionDef(self, node):
         self.defs.append((node.name, unparse(node).strip()))
+        self.defs.append((node.name, unparse(node).strip()))

typegraph/python/typegraph/utils.py

@@ -97,7 +97,9 @@ def get_file_hash(file_path: str) -> str:
     return sha256_hasher.hexdigest()
 
 
-def get_parent_directories(path):
+def get_parent_directories(
+    path: str,
+) -> List[str]:
     parents = []
 
     while True:
@@ -110,3 +112,18 @@ def get_parent_directories(path):
             break
 
     return parents[::-1]
+
+
+def get_relative_path(
+    module_path: List[str],
+    dep_path: List[str],
+) -> List[str]:
+    common = 0
+
+    max_len = min(len(module_path), len(dep_path))
+    for i in range(max_len):
+        if module_path[i] != dep_path[i]:
+            break
+        common += 1
+
+    return dep_path[common:]