Spaces:

lynx-analytics
/

lynxkite

Running

darabos commited on Apr 29, 2024

Commit

a06b506

1 Parent(s): bc2b550

Flexible inputs!

Files changed (8) hide show

server/lynxscribe_ops.py CHANGED Viewed

@@ -11,4 +11,4 @@ register_passive_op('WhatsApp', inputs={})
 register_passive_op('PII removal')
 register_passive_op('Intent classification')
 register_passive_op('System prompt', inputs={}, params=[P('prompt', 'You are a heplful chatbot.')])
-register_passive_op('LLM', params=[P('model', 'gpt4')])

 register_passive_op('PII removal')
 register_passive_op('Intent classification')
 register_passive_op('System prompt', inputs={}, params=[P('prompt', 'You are a heplful chatbot.')])
+register_passive_op('LLM', inputs={'multi': '*'}, params=[P('model', 'gpt4')])

server/main.py CHANGED Viewed

@@ -28,7 +28,7 @@ def save(req: SaveRequest):
 @app.post("/api/save")
 def save_and_execute(req: SaveRequest):
     save(req)
-    execute(req.ws)
     save(req)
     return req.ws

 @app.post("/api/save")
 def save_and_execute(req: SaveRequest):
     save(req)
+    workspace.execute(req.ws)
     save(req)
     return req.ws

server/ops.py CHANGED Viewed

@@ -57,9 +57,12 @@ class Op:
   def to_json(self):
     return {
       'type': self.type,
-      'data': { 'title': self.name, 'params': [p.to_json() for p in self.params.values()] },
-      'targetPosition': 'left' if self.inputs else None,
-      'sourcePosition': 'right' if self.outputs else None,
       'sub_nodes': [sub.to_json() for sub in self.sub_nodes.values()] if self.sub_nodes else None,
     }

   def to_json(self):
     return {
       'type': self.type,
+      'data': {
+        'title': self.name,
+        'inputs': {i: str(type) for i, type in self.inputs.items()},
+        'outputs': {o: str(type) for o, type in self.outputs.items()},
+        'params': [p.to_json() for p in self.params.values()],
+      },
       'sub_nodes': [sub.to_json() for sub in self.sub_nodes.values()] if self.sub_nodes else None,
     }

server/workspace.py CHANGED Viewed

@@ -71,6 +71,9 @@ def execute(ws):
                   data.error = str(e)
                   failed += 1
                   continue
                 data.error = None
                 outputs[node.id] = output
                 if op.type == 'graph_view' or op.type == 'table_view':

                   data.error = str(e)
                   failed += 1
                   continue
+                if len(op.inputs) == 1 and op.inputs.get('multi') == '*':
+                    # It's a flexible input. Create n+1 handles.
+                    data.inputs = {f'input{i}': None for i in range(len(inputs) + 1)}
                 data.error = None
                 outputs[node.id] = output
                 if op.type == 'graph_view' or op.type == 'table_view':

web/index.html CHANGED Viewed

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" href="/public/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>LynxKite 2024</title>
   </head>

 <html lang="en">
   <head>
     <meta charset="UTF-8" />
+    <link rel="icon" type="image/png" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>LynxKite 2024</title>
   </head>

web/src/LynxKiteFlow.svelte CHANGED Viewed

@@ -133,7 +133,10 @@
   function onconnect(connection: Connection) {
     edges.update((edges) => {
       // Only one source can connect to a given target.
-      return edges.filter((e) => e.source === connection.source || e.target !== connection.target);
     });
   }
   function nodeClick(e) {

   function onconnect(connection: Connection) {
     edges.update((edges) => {
       // Only one source can connect to a given target.
+      return edges.filter((e) =>
+        e.source === connection.source
+        || e.target !== connection.target
+        || e.targetHandle !== connection.targetHandle);
     });
   }
   function nodeClick(e) {

web/src/LynxKiteNode.svelte CHANGED Viewed

@@ -29,6 +29,9 @@
   function asPx(n: number) {
     return n ? n + 'px' : undefined;
   }
 </script>
 <div class="node-container" style:width={asPx(width)} style:height={asPx(height)} style={containerStyle}>
@@ -43,12 +46,16 @@
       {/if}
       <slot />
     {/if}
-    {#if sourcePosition}
-      <Handle type="source" position={sourcePosition} />
-    {/if}
-    {#if targetPosition}
-      <Handle type="target" position={targetPosition} />
-    {/if}
   </div>
 </div>

   function asPx(n: number) {
     return n ? n + 'px' : undefined;
   }
+  $: inputs = Object.entries(data.inputs || {});
+  $: outputs = Object.entries(data.outputs || {});
+  const handleOffsetDirection = { top: 'left', bottom: 'left', left: 'top', right: 'top' };
 </script>
 <div class="node-container" style:width={asPx(width)} style:height={asPx(height)} style={containerStyle}>
       {/if}
       <slot />
     {/if}
+    {#each inputs as [name, input], i}
+      <Handle
+        id={name} type="target" position={targetPosition || 'left'}
+        style="{handleOffsetDirection[targetPosition || 'left']}: {100 * (i + 1) / (inputs.length + 1)}%" />
+    {/each}
+    {#each outputs as [name, output], i}
+      <Handle
+        id={name} type="source" position={sourcePosition || 'right'}
+        style="{handleOffsetDirection[sourcePosition || 'right']}: {100 * (i + 1) / (outputs.length + 1)}%" />
+    {/each}
   </div>
 </div>

web/src/Workspace.svelte CHANGED Viewed

@@ -52,7 +52,8 @@
     align-items: center;
   }
   .tools a {
-    color: white;
     font-size: 1.5em;
   }
 </style>

     align-items: center;
   }
   .tools a {
+    color: #39bcf3;
     font-size: 1.5em;
+    padding: 0 10px;
   }
 </style>