fix(sdk/python): migration not considered

Author: michael-0acf4

meta-cli/src/com/server.rs

@@ -70,8 +70,11 @@ async fn config(req: HttpRequest) -> impl Responder {
                 "secrets": secrets,
                 "prefix": prefix,
                 "artifactsConfig": {
+                    // on sdk's side, cwd will match to the parent process (cli)
+                    // thus `dir` must be explicitly set to the canonical typegraph's `workdir`
                     "dir": artefact_base_dir,
                     "prismaMigration": {
+                        // only the cli is aware of the convention migrationDir := tg_workdir + config_folder + tg_name
                         "migrationDir": config.prisma_migrations_dir_rel(&parsed.typegraph),
                         "action": serde_json::to_value(migration_action).unwrap()
                     },

meta-cli/src/config.rs

@@ -1,7 +1,7 @@
 // Copyright Metatype OÜ, licensed under the Mozilla Public License Version 2.0.
 // SPDX-License-Identifier: MPL-2.0
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{anyhow, bail, Context, Result};
 use globset::{Glob, GlobSet, GlobSetBuilder};
 use lazy_static::lazy_static;
 use reqwest::Url;
@@ -244,18 +244,29 @@ impl Config {
             .unwrap_or(&DEFAULT_LOADER_CONFIG)
     }
 
-    pub fn prisma_migrations_dir_rel(&self, typegraph: &str) -> PathBuf {
+    /// `config migration dir` + `runtime` + `tg_name`   
+    pub fn prisma_migrations_dir_rel(&self, tg_name: &str) -> PathBuf {
         let mut path = self
             .typegraphs
             .materializers
             .prisma
             .migrations_path
             .as_deref()
-            .unwrap_or_else(|| Path::new("prisma/migrations"))
+            .unwrap_or_else(|| Path::new("prisma-migrations"))
             .to_path_buf();
-        path.push(typegraph);
+        path.push(tg_name);
         path
     }
+
+    /// canonical path to the migration given the typegraph path
+    pub fn prisma_migration_dir_abs(&self, tg_path: &Path, tg_name: &str) -> Result<PathBuf> {
+        if tg_path.is_dir() {
+            bail!("Given typegraph path {} is not a file", tg_path.display());
+        }
+        let mut base = tg_path.to_path_buf().clone();
+        base.pop(); // remove file
+        Ok(base.join(self.prisma_migrations_dir_rel(tg_name)))
+    }
 }
 
 #[cfg(test)]

meta-cli/src/deploy/push/pusher.rs

@@ -135,9 +135,10 @@ impl PushResult {
             name = name.cyan()
         ));
 
+        // tg workdir + prisma_migration_rel
         let migdir = ServerStore::get_config()
             .unwrap()
-            .prisma_migrations_dir_rel(&self.original_name);
+            .prisma_migration_dir_abs(&self.sdk_response.typegraph_path, &self.original_name)?;
 
         // TODO: use unpack from sdk? This requires another load event though.
         for migrations in self.migrations.iter() {

typegraph/core/src/utils/postprocess/prisma_rt.rs

@@ -9,7 +9,7 @@ use common::typegraph::Typegraph;
 use crate::utils::fs_host;
 use crate::utils::postprocess::PostProcessor;
 use crate::wit::core::MigrationConfig;
-use crate::wit::metatype::typegraph::host::{eprint, file_exists};
+use crate::wit::metatype::typegraph::host::{eprint, path_exists};
 
 pub struct PrismaProcessor {
     config: MigrationConfig,
@@ -41,12 +41,16 @@ impl PrismaProcessor {
                 rt_data.migration_options = Some(MigrationOptions {
                     migration_files: {
                         let path = fs_host::make_absolute(&path)?;
-                        match file_exists(&path.display().to_string())? {
+                        match path_exists(&path.display().to_string())? {
                             true => {
+                                eprint("PACKING IT..");
                                 let base64 = fs_host::compress_and_encode_base64(path)?;
                                 Some(base64)
                             }
-                            false => None,
+                            false => {
+                                eprint(&format!("FOUND NOTHING AT {}", path.display()));
+                                None
+                            }
                         }
                     },
                     create: self.config.action.create,

typegraph/core/wit/typegraph.wit

@@ -553,7 +553,7 @@ interface host {
     print: func(s: string)
     eprint: func(s: string)
     expand-glob: func(root: string, exclude: list<string>) -> result<list<string>, string>
-    file-exists: func(path: string) -> result<bool, string>
+    path-exists: func(path: string) -> result<bool, string>
     read-file: func(path: string) -> result<list<u8>, string>
     write-file: func(path: string, data: list<u8>) -> result<_, string>
     get-cwd: func() -> result<string, string>

typegraph/node/sdk/src/host/host.ts

@@ -56,7 +56,7 @@ export function getCwd(): string {
   }
 }
 
-export function fileExists(filePath: string): boolean {
+export function pathExists(filePath: string): boolean {
   try {
     return fs.existsSync(filePath);
   } catch (err) {

typegraph/python/typegraph/host/host.py

@@ -36,9 +36,9 @@ def expand_glob(self, root: str, exclude: List[str]) -> Result[List[str], str]:
         except Exception as e:
             return Err(str(e))
 
-    def file_exists(self, path: str) -> Result[bool, str]:
+    def path_exists(self, path: str) -> Result[bool, str]:
         try:
-            return Ok(os.path.isfile(path))
+            return Ok(os.path.isfile(path) or os.path.isdir(path))
         except Exception as e:
             return Err(str(e))