Merge pull request #50 from DeabLabs/devx-refactor

Devx refactor
DeabLabs · Aug 21, 2024 · c2e3590 · c2e3590
2 parents e3cbf3b + 52208cb
commit c2e3590
Show file tree

Hide file tree

Showing 56 changed files with 6,979 additions and 7,002 deletions.
diff --git a/packages/cannoli-core/src/bake.ts b/packages/cannoli-core/src/bake.ts
@@ -1,6 +1,6 @@
 import { run } from "./cannoli";
 import { FileManager } from "./fileManager";
-import { VerifiedCannoliCanvasData } from "./models/graph";
+import { VerifiedCannoliCanvasData } from "./graph";
 import { LLMConfig } from "./providers";
 import { Action, HttpTemplate } from "./run";
 

diff --git a/packages/cannoli-core/src/factory.ts b/packages/cannoli-core/src/factory.ts
@@ -25,7 +25,7 @@ import {
 	VerifiedCannoliCanvasGroupData,
 	AllVerifiedCannoliCanvasNodeData,
 	VerifiedCannoliCanvasEdgeData,
-} from "./models/graph";
+} from "./graph";
 
 export enum IndicatedNodeType {
 	Call = "call",
@@ -293,7 +293,7 @@ export class CannoliFactory {
 			node.type === "text" || node.type === "file"
 				? this.parseNodeReferences(node)
 				: [];
-		const groups = this.getGroupsForVertex(node);
+		let groups = this.getGroupsForVertex(node);
 		const dependencies = [] as string[];
 		const originalObject = null;
 		const status =
@@ -305,6 +305,10 @@ export class CannoliFactory {
 			return null;
 		}
 
+		if (type === FloatingNodeType.Variable) {
+			groups = [];
+		}
+
 		return {
 			kind,
 			type,

diff --git a/packages/cannoli-core/src/fileManager.ts b/packages/cannoli-core/src/fileManager.ts
@@ -1,4 +1,4 @@
-import { Reference } from "./models/graph";
+import { Reference } from "./graph";
 
 export interface FileManager {
     editNote(

diff --git a/packages/cannoli-core/src/models/graph.ts → packages/cannoli-core/src/graph.ts b/packages/cannoli-core/src/models/graph.ts → packages/cannoli-core/src/graph.ts
@@ -5,31 +5,28 @@ import {
 	CanvasGroupData,
 	CanvasLinkData,
 	CanvasTextData,
-} from "../persistor";
-
-import { CannoliObject } from "./object";
-import { CannoliGroup, RepeatGroup } from "./group";
-import {
-	CallNode,
-	CannoliNode,
-	ChooseNode,
-	ContentNode,
-	FormNode,
-	FloatingNode,
-	FormatterNode,
-	HttpNode,
-	ReferenceNode,
-	SearchNode,
-} from "./node";
-import {
-	CannoliEdge,
-	ChatConverterEdge,
-	ChatResponseEdge,
-	LoggingEdge,
-	SystemMessageEdge,
-} from "./edge";
-import { GenericCompletionResponse } from "../providers";
-import { ReceiveInfo } from "../run";
+} from "./persistor";
+
+import { GenericCompletionResponse } from "./providers";
+import { ReceiveInfo } from "./run";
+import { CannoliObject } from "./graph/CannoliObject";
+import { CannoliEdge } from "./graph/objects/CannoliEdge";
+import { ChatConverterEdge } from "./graph/objects/edges/ChatConverterEdge";
+import { ChatResponseEdge } from "./graph/objects/edges/ChatResponseEdge";
+import { LoggingEdge } from "./graph/objects/edges/LoggingEdge";
+import { SystemMessageEdge } from "./graph/objects/edges/SystemMessageEdge";
+import { CannoliGroup } from "./graph/objects/vertices/CannoliGroup";
+import { CannoliNode } from "./graph/objects/vertices/CannoliNode";
+import { RepeatGroup } from "./graph/objects/vertices/groups/RepeatGroup";
+import { ChooseNode } from "./graph/objects/vertices/nodes/call/ChooseNode";
+import { FormNode } from "./graph/objects/vertices/nodes/call/FormNode";
+import { CallNode } from "./graph/objects/vertices/nodes/CallNode";
+import { FormatterNode } from "./graph/objects/vertices/nodes/content/FormatterNode";
+import { HttpNode } from "./graph/objects/vertices/nodes/content/HttpNode";
+import { ReferenceNode } from "./graph/objects/vertices/nodes/content/ReferenceNode";
+import { SearchNode } from "./graph/objects/vertices/nodes/content/SearchNode";
+import { ContentNode } from "./graph/objects/vertices/nodes/ContentNode";
+import { FloatingNode } from "./graph/objects/FloatingNode";
 
 export enum CannoliObjectKind {
 	Node = "node",