Merge branch 'Ironclad:main' into qdrant

Ironclad · Mar 27, 2024 · a1abb46 · a1abb46
2 parents eefe824 + 9786e9c
commit a1abb46
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 39 deletions.
diff --git a/packages/app/src-tauri/tauri.conf.json b/packages/app/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Rivet",
-    "version": "1.7.8"
+    "version": "1.7.9"
   },
   "tauri": {
     "allowlist": {

diff --git a/packages/app/src/hooks/useSaveProject.ts b/packages/app/src/hooks/useSaveProject.ts
@@ -30,18 +30,23 @@ export function useSaveProject() {
       saving = toast.info('Saving project');
     }, 500);
 
-    await ioProvider.saveProjectDataNoPrompt(newProject, { testSuites }, loadedProject.path);
+    try {
+      await ioProvider.saveProjectDataNoPrompt(newProject, { testSuites }, loadedProject.path);
 
-    if (saving != null) {
-      toast.dismiss(saving);
-    }
-    clearTimeout(savingTimeout);
+      if (saving != null) {
+        toast.dismiss(saving);
+      }
+      clearTimeout(savingTimeout);
 
-    toast.success('Project saved');
-    setLoadedProject({
-      loaded: true,
-      path: loadedProject.path,
-    });
+      toast.success('Project saved');
+      setLoadedProject({
+        loaded: true,
+        path: loadedProject.path,
+      });
+    } catch (cause) {
+      clearTimeout(savingTimeout);
+      toast.error('Failed to save project');
+    }
   }
 
   async function saveProjectAs() {
@@ -57,26 +62,31 @@ export function useSaveProject() {
       saving = toast.info('Saving project');
     }, 500);
 
-    const filePath = await ioProvider.saveProjectData(newProject, { testSuites });
+    try {
+      const filePath = await ioProvider.saveProjectData(newProject, { testSuites });
 
-    if (saving != null) {
-      toast.dismiss(saving);
-    }
-    clearTimeout(savingTimeout);
+      if (saving != null) {
+        toast.dismiss(saving);
+      }
+      clearTimeout(savingTimeout);
 
-    if (filePath) {
-      toast.success('Project saved');
-      setLoadedProject({
-        loaded: true,
-        path: filePath,
-      });
-      setOpenedProjects((projects) => ({
-        ...projects,
-        [project.metadata.id]: {
-          project,
-          fsPath: filePath,
-        },
-      }));
+      if (filePath) {
+        toast.success('Project saved');
+        setLoadedProject({
+          loaded: true,
+          path: filePath,
+        });
+        setOpenedProjects((projects) => ({
+          ...projects,
+          [project.metadata.id]: {
+            project,
+            fsPath: filePath,
+          },
+        }));
+      }
+    } catch (cause) {
+      clearTimeout(savingTimeout);
+      toast.error('Failed to save project');
     }
   }
 

diff --git a/packages/app/src/io/TauriIOProvider.ts b/packages/app/src/io/TauriIOProvider.ts
@@ -132,7 +132,7 @@ export class TauriIOProvider implements IOProvider {
 
   async loadProjectDataNoPrompt(path: string): Promise<{ project: Project; testData: TrivetData }> {
     const data = await readTextFile(path);
-    const [projectData, attachedData] = deserializeProject(data);
+    const [projectData, attachedData] = deserializeProject(data, path);
 
     const trivetData = attachedData.trivet
       ? deserializeTrivetData(attachedData.trivet as SerializedTrivetData)

diff --git a/packages/cli/README.md b/packages/cli/README.md
@@ -160,6 +160,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://twitter.com/lou7s"><img src="https://avatars.githubusercontent.com/u/35469434?v=4?s=100" width="100px;" alt="loui7"/><br /><sub><b>loui7</b></sub></a><br /><a href="https://github.com/Ironclad/rivet/commits?author=loui7" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://aschen.tech"><img src="https://avatars.githubusercontent.com/u/4447392?v=4?s=100" width="100px;" alt="Adrien Maret"/><br /><sub><b>Adrien Maret</b></sub></a><br /><a href="https://github.com/Ironclad/rivet/commits?author=Aschen" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ShravanSunder"><img src="https://avatars.githubusercontent.com/u/5294949?v=4?s=100" width="100px;" alt="Shravan Sunder"/><br /><sub><b>Shravan Sunder</b></sub></a><br /><a href="https://github.com/Ironclad/rivet/commits?author=ShravanSunder" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -2,7 +2,7 @@
   "name": "@ironclad/rivet-cli",
   "license": "MIT",
   "repository": "https://github.com/ironclad/rivet",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "src": "bin/cli.ts",
   "bin": {
     "rivet": "bin/cli.js"

diff --git a/packages/core/README.md b/packages/core/README.md
@@ -160,6 +160,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://twitter.com/lou7s"><img src="https://avatars.githubusercontent.com/u/35469434?v=4?s=100" width="100px;" alt="loui7"/><br /><sub><b>loui7</b></sub></a><br /><a href="https://github.com/Ironclad/rivet/commits?author=loui7" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://aschen.tech"><img src="https://avatars.githubusercontent.com/u/4447392?v=4?s=100" width="100px;" alt="Adrien Maret"/><br /><sub><b>Adrien Maret</b></sub></a><br /><a href="https://github.com/Ironclad/rivet/commits?author=Aschen" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ShravanSunder"><img src="https://avatars.githubusercontent.com/u/5294949?v=4?s=100" width="100px;" alt="Shravan Sunder"/><br /><sub><b>Shravan Sunder</b></sub></a><br /><a href="https://github.com/Ironclad/rivet/commits?author=ShravanSunder" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -2,7 +2,7 @@
   "name": "@ironclad/rivet-core",
   "license": "MIT",
   "repository": "https://github.com/ironclad/rivet",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "packageManager": "[email protected]",
   "main": "dist/cjs/bundle.cjs",
   "module": "dist/esm/index.js",

diff --git a/packages/core/src/model/Project.ts b/packages/core/src/model/Project.ts
@@ -12,6 +12,7 @@ export type Project = {
     title: string;
     description: string;
     mainGraphId?: GraphId;
+    path?: string;
   };
 
   plugins?: PluginLoadSpec[];

diff --git a/packages/core/src/utils/serialization/serialization.ts b/packages/core/src/utils/serialization/serialization.ts
@@ -19,9 +19,12 @@ export function serializeProject(project: Project, attachedData?: AttachedData):
   return projectV4Serializer(project, attachedData);
 }
 
-export function deserializeProject(serializedProject: unknown): [Project, AttachedData] {
+export function deserializeProject(serializedProject: unknown, path: string | null = null): [Project, AttachedData] {
   try {
-    return projectV4Deserializer(serializedProject);
+    const result = projectV4Deserializer(serializedProject);
+    if (path !== null)
+      result[0].metadata.path = path;
+    return result;
   } catch (err) {
     if (err instanceof yaml.YAMLError) {
       yamlProblem(err);

diff --git a/packages/core/src/utils/serialization/serialization_v4.ts b/packages/core/src/utils/serialization/serialization_v4.ts
@@ -93,8 +93,16 @@ export function graphV4Deserializer(data: unknown): NodeGraph {
 }
 
 export function projectV4Serializer(project: Project, attachedData?: AttachedData): unknown {
+  const filteredProject = {
+    ...project,
+    metadata: {
+      ...project.metadata,
+      path: undefined,
+    }
+  }
+
   // Make sure all data is ordered deterministically first
-  const stabilized = JSON.parse(stableStringify(toSerializedProject(project, attachedData)));
+  const stabilized = JSON.parse(stableStringify(toSerializedProject(filteredProject, attachedData)));
 
   const serialized = yaml.stringify(
     {

diff --git a/packages/core/test/testUtils.ts b/packages/core/test/testUtils.ts
@@ -22,11 +22,11 @@ export async function loadTestGraphInProcessor(graphName: string) {
 
 export async function loadProjectFromFile(path: string): Promise<Project> {
   const content = await readFile(path, { encoding: 'utf8' });
-  return loadProjectFromString(content);
+  return loadProjectFromString(content, path);
 }
 
-export function loadProjectFromString(content: string): Project {
-  const [project] = deserializeProject(content);
+export function loadProjectFromString(content: string, path: string | null = null): Project {
+  const [project] = deserializeProject(content, path);
   return project;
 }
 

diff --git a/packages/node/README.md b/packages/node/README.md
@@ -160,6 +160,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://twitter.com/lou7s"><img src="https://avatars.githubusercontent.com/u/35469434?v=4?s=100" width="100px;" alt="loui7"/><br /><sub><b>loui7</b></sub></a><br /><a href="https://github.com/Ironclad/rivet/commits?author=loui7" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://aschen.tech"><img src="https://avatars.githubusercontent.com/u/4447392?v=4?s=100" width="100px;" alt="Adrien Maret"/><br /><sub><b>Adrien Maret</b></sub></a><br /><a href="https://github.com/Ironclad/rivet/commits?author=Aschen" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ShravanSunder"><img src="https://avatars.githubusercontent.com/u/5294949?v=4?s=100" width="100px;" alt="Shravan Sunder"/><br /><sub><b>Shravan Sunder</b></sub></a><br /><a href="https://github.com/Ironclad/rivet/commits?author=ShravanSunder" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -2,7 +2,7 @@
   "name": "@ironclad/rivet-node",
   "license": "MIT",
   "repository": "https://github.com/ironclad/rivet",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "main": "dist/cjs/bundle.cjs",
   "module": "dist/esm/index.js",
   "src": "src/index.ts",