feat(gate): update prisma migrations and read wasm file in engine

Author: destifo

typegate/engine/src/runtimes/wasmedge.rs

@@ -18,6 +18,8 @@ use wasmedge_sdk::{
     Module,
 };
 
+use std::env;
+
 #[derive(Deserialize)]
 #[serde(crate = "serde")]
 pub struct WasiInput {
@@ -54,8 +56,14 @@ fn param_cast(out: &str, res: &mut Vec<Box<dyn Any + Send + Sync>>) -> Result<St
 pub fn op_wasmedge_wasi(#[serde] input: WasiInput) -> Result<String> {
     // https://github.com/second-state/wasmedge-rustsdk-examples
 
-    let wasm_path = PathBuf::from(input.wasm);
-    let wasm_binary = common::archive::encode_to_base_64(&wasm_path).unwrap();
+    let wasm_relative_path = PathBuf::from(input.wasm);
+
+    let wasm_absolute_path = match env::current_dir() {
+        Ok(cwd) => cwd.join(wasm_relative_path),
+        Err(e) => return Err(anyhow::anyhow!(e)),
+    };
+
+    let wasm_binary = common::archive::encode_to_base_64(&wasm_absolute_path).unwrap();
 
     let bytes = general_purpose::STANDARD.decode(wasm_binary).unwrap();
     let module = Module::from_bytes(None, bytes).unwrap();

typegate/src/typegraphs/prisma_migration.json

@@ -15,21 +15,13 @@
         "deploy": 14,
         "reset": 18
       },
-      "required": [
-        "diff",
-        "apply",
-        "create",
-        "deploy",
-        "reset"
-      ]
+      "required": ["diff", "apply", "create", "deploy", "reset"]
     },
     {
       "type": "function",
       "title": "func_10",
       "runtime": 1,
-      "policies": [
-        0
-      ],
+      "policies": [0],
       "config": {},
       "as_id": false,
       "input": 2,
@@ -95,9 +87,7 @@
       "type": "function",
       "title": "func_23",
       "runtime": 1,
-      "policies": [
-        0
-      ],
+      "policies": [0],
       "config": {},
       "as_id": false,
       "input": 8,
@@ -147,9 +137,7 @@
       "type": "function",
       "title": "func_40",
       "runtime": 1,
-      "policies": [
-        0
-      ],
+      "policies": [0],
       "config": {},
       "as_id": false,
       "input": 12,
@@ -193,9 +181,7 @@
       "type": "function",
       "title": "func_51",
       "runtime": 1,
-      "policies": [
-        0
-      ],
+      "policies": [0],
       "config": {},
       "as_id": false,
       "input": 15,
@@ -243,9 +229,7 @@
       "type": "function",
       "title": "func_58",
       "runtime": 1,
-      "policies": [
-        0
-      ],
+      "policies": [0],
       "config": {},
       "as_id": false,
       "input": 19,
@@ -366,9 +350,7 @@
         "name": "basic",
         "protocol": "basic",
         "auth_data": {
-          "users": [
-            "admin"
-          ]
+          "users": ["admin"]
         }
       }
     ],
@@ -380,6 +362,7 @@
       "local_excess": 5
     },
     "version": "0.0.3",
-    "random_seed": null
+    "random_seed": null,
+    "ref_files": {}
   }
-}
+}

typegraph/python/typegraph/graph/tg_deploy.py

@@ -2,16 +2,17 @@
 # SPDX-License-Identifier: MPL-2.0
 
 import json
-from base64 import b64encode
+import os
+import sys
 from dataclasses import dataclass
 from typing import Dict, Optional, Union
 from urllib import request
-from typegraph.graph.shared_types import BasicAuth
-from typegraph.wit import ArtifactResolutionConfig
+
+from typegraph.gen.exports.utils import QueryDeployParams
 from typegraph.gen.types import Err
+from typegraph.graph.shared_types import BasicAuth
 from typegraph.graph.typegraph import TypegraphOutput
-from typegraph.gen.exports.utils import QueryDeployParams
-from typegraph.wit import store, wit_utils
+from typegraph.wit import ArtifactResolutionConfig, store, wit_utils
 
 
 @dataclass
@@ -55,23 +56,58 @@ def tg_deploy(tg: TypegraphOutput, params: TypegraphDeployParams) -> DeployResul
         headers["Authorization"] = params.auth.as_header_value()
     serialized = tg.serialize(params.artifacts_config)
 
+    res = wit_utils.gql_deploy_query(
+        store,
+        params=QueryDeployParams(
+            tg=serialized,
+            secrets=[(k, v) for k, v in (params.secrets or {}).items()],
+        ),
+    )
+
+    if isinstance(res, Err):
+        raise Exception(res.value)
+
+    req = request.Request(
+        url=url,
+        method="POST",
+        headers=headers,
+        data=res.value.encode(),
+    )
+
+    result = DeployResult(
+        serialized=serialized,
+        typegate=handle_response(request.urlopen(req).read().decode()),
+    )
+
     # upload the referred files
-    ref_files = core.get_ref_files(store)
-    if isinstance(ref_files, Err):
-        raise Exception(ref_files.value)
+    # print("***************A")
+    ref_files = {
+        "662307922d7b879a17ce206d57db63b27630a7b4a8de2455a5730fb4bfe07a5c": "file:rust.wasm"
+    }
+    # if isinstance(ref_files, Err):
+    #     raise Exception(ref_files.value)
 
     # TODO: fetch all the upload by one request
-    get_upload_url = params.base_url + sep + "get-upload-url"
-    for file_hash, file_path in ref_files.value:
+    get_upload_url = params.base_url + sep + tg.name + "/get-upload-url"
+    for file_hash, file_path in ref_files.items():
+        prefix = "file:"
+        if not file_path.startswith(prefix):
+            raise Exception(f"file path {file_path} should start with {prefix}")
+
+        curr_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
+        file_path = os.path.join(curr_dir, file_path[len(prefix) :])
+
         with open(file_path, "rb") as file:
             file_content = file.read()
             artifact = UploadArtifactMeta(
-                name=file.name,
+                name=os.path.basename(file_path),
                 file_hash=file_hash,
                 file_size_in_bytes=len(file_content),
             )
+
+            artifact_json = json.dumps(artifact.__dict__).encode()
             req = request.Request(
-                url=get_upload_url, method="GET", headers=headers, data=artifact
+                url=get_upload_url, method="PUT", headers=headers, data=artifact_json
             )
 
             response = handle_response(request.urlopen(req).read().decode())
@@ -84,27 +120,7 @@ def tg_deploy(tg: TypegraphOutput, params: TypegraphDeployParams) -> DeployResul
             )
             response = request.urlopen(upload_req)
 
-    res = wit_utils.gql_deploy_query(
-        store,
-        params=QueryDeployParams(
-            tg=serialized,
-            secrets=[(k, v) for k, v in (params.secrets or {}).items()],
-        ),
-    )
-
-    if isinstance(res, Err):
-        raise Exception(res.value)
-
-    req = request.Request(
-        url=url,
-        method="POST",
-        headers=headers,
-        data=res.value.encode(),
-    )
-    return DeployResult(
-        serialized=serialized,
-        typegate=handle_response(request.urlopen(req).read().decode()),
-    )
+    return result
 
 
 def tg_remove(tg: TypegraphOutput, params: TypegraphRemoveParams):