wip: store artifact deps in global_store

Author: destifo

libs/common/src/typegraph/mod.rs

@@ -89,6 +89,14 @@ pub struct Queries {
     pub endpoints: Vec<String>,
 }
 
+// #[cfg_attr(feature = "codegen", derive(JsonSchema))]
+// #[derive(Serialize, Deserialize, Clone, Debug, Default)]
+// pub struct DependencyMeta {
+//     pub name: String,
+//     pub dep_hash: String,
+//     pub relative_path_prefix: PathBuf,
+// }
+
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]
 #[derive(Serialize, Deserialize, Clone, Debug, Default)]
 pub struct TypeMeta {
@@ -101,6 +109,7 @@ pub struct TypeMeta {
     pub version: String,
     pub random_seed: Option<u32>,
     pub ref_artifacts: HashMap<String, PathBuf>,
+    // pub artifact_deps: HashMap<String, Vec<DependencyMeta>>,
 }
 
 #[cfg_attr(feature = "codegen", derive(JsonSchema))]

typegraph/core/src/conversion/runtimes.rs

@@ -6,6 +6,7 @@ use std::collections::HashMap;
 use std::rc::Rc;
 
 use crate::errors::Result;
+use crate::global_store::Store;
 use crate::runtimes::prisma::get_prisma_context;
 use crate::runtimes::{
     DenoMaterializer, Materializer as RawMaterializer, PythonMaterializer, RandomMaterializer,
@@ -231,6 +232,11 @@ impl MaterializerConverter for PythonMaterializer {
             Module(module) => {
                 c.add_ref_artifacts(module.artifact_hash.clone(), module.artifact.clone().into())?;
 
+                let deps = module.deps.clone();
+                for dep in deps {
+                    Store::register_dep(module.artifact_hash.clone(), dep);
+                }
+
                 let data = serde_json::from_value(json!({
                     "artifact": module.artifact,
                     "artifact_hash": module.artifact_hash,

typegraph/core/src/global_store.rs

@@ -12,7 +12,9 @@ use crate::wit::utils::Auth as WitAuth;
 
 #[allow(unused)]
 use crate::wit::core::ArtifactResolutionConfig;
-use crate::wit::runtimes::{Effect, MaterializerDenoPredefined, MaterializerId};
+use crate::wit::runtimes::{
+    Effect, MaterializerDenoPredefined, MaterializerId, ModuleDependencyMeta,
+};
 use graphql_parser::parse_query;
 use indexmap::IndexMap;
 use std::path::PathBuf;
@@ -52,6 +54,9 @@ pub struct Store {
     predefined_deno_functions: HashMap<String, MaterializerId>,
     deno_modules: HashMap<String, MaterializerId>,
 
+    // module dependencies
+    artifact_deps: HashMap<String, Vec<ModuleDependencyMeta>>,
+
     public_policy_id: PolicyId,
 
     prisma_migration_runtime: RuntimeId,
@@ -237,6 +242,23 @@ impl Store {
         with_store_mut(|store| store.random_seed = value)
     }
 
+    // pub fn get_deps(artifact_hash: String) -> Vec<ModuleDependencyMeta> {
+    //     with_store(|store| match store.artifact_deps.get(&artifact_hash) {
+    //         Some(deps) => deps.clone(),
+    //         None => vec![],
+    //     })
+    // }
+
+    pub fn register_dep(artifact_hash: String, dep: ModuleDependencyMeta) {
+        with_store_mut(|store| {
+            store
+                .artifact_deps
+                .entry(artifact_hash)
+                .or_default()
+                .push(dep)
+        })
+    }
+
     pub fn pick_branch_by_path(supertype_id: TypeId, path: &[String]) -> Result<(Type, TypeId)> {
         let (_, supertype) = supertype_id.resolve_ref()?;
         let supertype = &supertype;

typegraph/core/wit/typegraph.wit

@@ -326,10 +326,17 @@ interface runtimes {
         fn: string,
     }
 
+    record module-dependency-meta {
+        path: string,
+        dep-hash: string,
+        relative-path-prefix: string,
+    }
+
     record materializer-python-module {
         runtime: runtime-id,
         artifact: string,
         artifact-hash: string,
+        deps: list<module-dependency-meta>,
     }
 
     record materializer-python-import {

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

@@ -3,10 +3,7 @@
 
 import * as t from "../types.js";
 import { runtimes } from "../wit.js";
-import {
-  DependencyMeta,
-  Effect,
-} from "../gen/interfaces/metatype-typegraph-runtimes.js";
+import { Effect } from "../gen/interfaces/metatype-typegraph-runtimes.js";
 import { Materializer, Runtime } from "./mod.js";
 import { fx } from "../index.js";
 import { getFileHash } from "../utils/file_utils.js";
@@ -110,21 +107,21 @@ export class PythonRuntime extends Runtime {
     const artifactHash = await getFileHash(module);
 
     // generate dep meta
-    const depMetas: DependencyMeta[] = [];
-    for (const dep of deps) {
-      const depHash = await getFileHash(dep);
-      const depMeta: DependencyMeta = {
-        path: dep,
-        depHash: depHash,
-      };
-      depMetas.push(depMeta);
-    }
+    // const depMetas: DependencyMeta[] = [];
+    // for (const dep of deps) {
+    //   const depHash = await getFileHash(dep);
+    //   const depMeta: DependencyMeta = {
+    //     path: dep,
+    //     depHash: depHash,
+    //   };
+    //   depMetas.push(depMeta);
+    // }
 
     const matId = runtimes.fromPythonModule(base, {
       artifact: module,
       runtime: this._id,
       artifactHash: artifactHash,
-      deps: depMetas,
+      deps: [],
     });
 
     const pyModMatId = runtimes.fromPythonImport(base, {

typegraph/python/typegraph/runtimes/python.py

@@ -6,10 +6,8 @@
 from typing import TYPE_CHECKING, List, Optional
 
 from astunparse import unparse
-
 from typegraph.gen.exports.runtimes import (
     BaseMaterializer,
-    DependencyMeta,
     Effect,
     EffectRead,
     MaterializerPythonDef,
@@ -106,10 +104,10 @@ def import_(
 
         # generate dep_metas
         dep_metas = []
-        for dep in deps:
-            dep_hash = get_file_hash(dep)
-            dep_meta = DependencyMeta(path=dep, dep_hash=dep_hash)
-            dep_metas.append(dep_meta)
+        # for dep in deps:
+        #     dep_hash = get_file_hash(dep)
+        #     dep_meta = DependencyMeta(path=dep, dep_hash=dep_hash)
+        #     dep_metas.append(dep_meta)
 
         base = BaseMaterializer(runtime=self.id.value, effect=effect)
         mat_id = runtimes.from_python_module(
@@ -118,7 +116,7 @@ def import_(
             MaterializerPythonModule(
                 artifact=module,
                 artifact_hash=artifact_hash,
-                deps=deps,
+                deps=dep_metas,
                 runtime=self.id.value,
             ),
         )