Working MVP; no signup UI just the features

Author: baebranch

.vscode/tasks.json

@@ -15,6 +15,16 @@
       ],
       "problemMatcher": []
     },
+    {
+      "label": "Build React APP",
+      "type": "shell",
+      "command": "npm",
+      "args": [
+        "run",
+        "build"
+      ],
+      "problemMatcher": []
+    },
     {
       "label": "Node & Edge Type Seeder",
       "type": "shell",

desktop/gui.py

@@ -16,5 +16,6 @@ def splash_close(window):
 webview.start(splash_close, (splash_screen,), http_server=False)
 
 # Open main window 
-webview.create_window('Flow Control', 'http://localhost:1212/') 
+# webview.create_window('Flow Control', 'http://localhost:1212/') 
+webview.create_window('Flow Control', html='./index.html')
 webview.start() 

package-lock.json

@@ -25,6 +25,7 @@
   "devDependencies": {
     "@types/react": "^18.2.53",
     "@types/react-dom": "^18.2.18",
+    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^6.20.0",
     "@typescript-eslint/parser": "^6.20.0",
     "@vitejs/plugin-react": "^4.2.1",

package.json

@@ -1,5 +1,6 @@
 import sqlalchemy as sql
 from sqlalchemy.sql import text
+from secrets import token_urlsafe
 from datetime import datetime, timezone
 from sqlalchemy import create_engine, MetaData, select, String, JSON, DateTime, ForeignKey, Integer, Text, inspect, update
 from sqlalchemy.orm import Session, DeclarativeBase, mapped_column, validates, relationship, Mapped, sessionmaker, reconstructor
@@ -11,9 +12,11 @@
 class Workspace(Base):
   __tablename__ = 'workspaces'
   id = sql.Column(sql.Integer, primary_key=True, autoincrement=True)
+  slug = sql.Column(sql.String, nullable=False, unique=True, default=token_urlsafe(6))
   name = sql.Column(sql.String, nullable=False)
   description = sql.Column(sql.Text, nullable=True)
   icon = sql.Column(sql.String, nullable=True)
+  default_flow_id = sql.Column(sql.Integer, nullable=True)
   created_at = sql.Column(sql.DateTime, default=datetime.now(timezone.utc))
   updated_at = sql.Column(sql.DateTime, default=datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
 
@@ -27,12 +30,19 @@ def validate_name(self, key, name):
     return name
 
   def __repr__(self):
-    return f'<Workspace {self.id} {self.name} {self.description} {bool(self.icon)} {self.created_at} {self.updated_at}>'
+    return f'<Workspace {self.id} {self.slug} {self.name} {self.description} {bool(self.icon)} {self.default_flow_id} {self.created_at} {self.updated_at}>'
+  
+  @property
+  def default(self):
+    if self.default_flow_id:
+      return session.query(Flow).filter_by(id = self.default_flow_id).first()
+    return session.query(Flow).filter_by(default = True).where(Flow.workspace_id == self.id).first()
 
 
 class Flow(Base):
   __tablename__ = 'flows'
   id = sql.Column(sql.Integer, primary_key=True, autoincrement=True)
+  slug = sql.Column(sql.String, nullable=False, unique=True, default=token_urlsafe(6))
   name = sql.Column(sql.String, nullable=False)
   description = sql.Column(sql.Text, nullable=True)
   default = sql.Column(sql.Boolean, default=False)
@@ -168,10 +178,13 @@ def __repr__(self):
 session = Session()
 
 # Schema updates
+# schema_update_handler(session.execute, text('ALTER TABLE flows ADD COLUMN slug VARCHAR;'))
+# schema_update_handler(session.execute, text('ALTER TABLE flows ADD COLUMN position JSON;'))
 # schema_update_handler(session.execute, text('ALTER TABLE workspaces ADD COLUMN icon TEXT;'))
-# schema_update_handler(session.execute, text('ALTER TABLE node_types ADD COLUMN fields JSON;'))
 # schema_update_handler(session.execute, text('ALTER TABLE edge_types ADD COLUMN fields JSON;'))
-# schema_update_handler(session.execute, text('ALTER TABLE flows ADD COLUMN position JSON;'))
+# schema_update_handler(session.execute, text('ALTER TABLE node_types ADD COLUMN fields JSON;'))
+# schema_update_handler(session.execute, text('ALTER TABLE workspaces ADD COLUMN slug VARCHAR;'))
+# schema_update_handler(session.execute, text('ALTER TABLE workspaces ADD COLUMN default_flow_id INTEGER;'))  
 
 # Was to try to implement automatic schema updates
 metadata = MetaData()

server/db/models.py

@@ -15,14 +15,17 @@ def seed() -> bool:
     NodeType(slug='source', name='Source', description='A card node with 4 source handles no targets.', fields={'title': 'text', 'body': 'textarea'}),
     NodeType(slug='card', name='Card', description='Header and body node with 1 source and 1 target handle.', fields={'title': 'text', 'body': 'textarea'}),
     NodeType(slug='default', name='Default', description='A simple node with 1 target and source handle each.', fields={'label': 'textarea'}), # Built-in node type
+    NodeType(slug='subflow', name='SubFlow', description='A SubFlow node used to denote the entry point to a subflow.', fields={'flow': 'text', 'title': 'text', 'body': 'textarea'}), # Built-in node type
   ]
-  try:
-    for node_type in node_types:
+  for node_type in node_types:
+    try:
+      print(node_type)
       session.add(node_type)
       session.commit()
       new_nodes += 1
-  except:
-    pass
+    except Exception as e:
+      session.rollback()
+      print(e)
 
   # Create the edge types
   edge_types = [
@@ -32,13 +35,14 @@ def seed() -> bool:
     EdgeType(slug='smoothstep', name='Smooth Step', description='the bends in this step edge are rounded.'), # Built-in edge type
   ]
 
-  try:
-    for edge_type in edge_types:
+  for edge_type in edge_types:
+    try:
       session.add(edge_type)
       session.commit()
       new_edges += 1
-  except:
-    pass
+    except:
+      session.rollback()
+      pass
 
   # Finished database seeding
   print(f'...database seeded successfully. {new_nodes} new nodes and {new_edges} new edges added.')

server/db/seed_types.py

@@ -17,9 +17,9 @@ type Query {
   getWorkspaces: WorkspaceResults!
 
   # Flow
-  getFlow(id: ID!): FlowResult!
-  getFlows(workspace_id: ID): FlowResults!
   getDefaultFlow(workspace_id: ID): FlowResult!
+  getFlow(slug: String, workspace_id: ID!): FlowResult!
+  getFlows(workspace_id: ID, slugs: [String]): FlowResults!
 
   # Node Type
   getNodeType(id: ID!): NodeTypeResult!

server/gql/functions.gql

@@ -11,9 +11,11 @@ type Status {
 # Worksapce Type
 type Worksapce {
   id: ID!
+  slug: String!
   name: String!
   description: String
   icon: String
+  default: Flow
   created_at: String!
   updated_at: String!
 }
@@ -35,6 +37,7 @@ type WorkspaceResults {
 # Flow Type
 type Flow {
   id: ID!
+  slug: String!
   name: String!
   description: String
   default: Boolean!

server/gql/schema.gql

@@ -30,8 +30,8 @@ def getWorkspace(_, info, **kwargs):
 
 @response_handler
 def getWorkspaces(_, info, **kwargs):
-  worksapces = session.query(Workspace).all()
-  return {'workspaces': worksapces}
+  workspaces = session.query(Workspace).all()
+  return {'workspaces': workspaces}
 
 @response_handler
 def createWorkspace(_, info, **kwargs):
@@ -44,6 +44,7 @@ def createWorkspace(_, info, **kwargs):
   # Create the default main flow for the workspace
   flow = Flow(name='Main', workspace=workspace, description='The main flow for this workspace.', default=True)
   session.add(flow)
+  workspace.default = flow
   session.commit()
 
   # Return the new workspace
@@ -67,12 +68,17 @@ def deleteWorkspace(_, info, **kwargs):
 # Flow Resolvers
 @response_handler
 def getFlow(_, info, **kwargs):
-  flow = session.query(Flow).filter_by(id=kwargs.get('id')).first()
+  flow = session.query(Flow).filter_by(slug=kwargs.get('slug'), workspace_id=kwargs.get('workspace_id')).first()
   return {'flow': flow}
 
 @response_handler
 def getFlows(_, info, **kwargs):
-  flows = session.query(Flow).filter_by(workspace_id=kwargs.get('workspace_id')).all()
+  if workspace_id := kwargs.get('workspace_id', None):
+    flows = session.query(Flow).filter_by(workspace_id=workspace_id).all()
+  elif slugs := kwargs.get('slugs', None):
+    flows = session.query(Flow).filter(Flow.slug.in_(slugs)).all()
+  else:
+    raise Exception('Invalid query parameters.')
   return {'flows': flows}
 
 @response_handler
@@ -124,10 +130,18 @@ def getNodes(_, info, **kwargs):
 
 @response_handler
 def createNode(_, info, **kwargs):
+  # Create a new node model
   node = Node(**kwargs)
   node.node = unquote(kwargs.get('node', '{}'))
   session.add(node)
   session.commit()
+
+  # If the node is a subflow, create a new flow for it
+  if node.node_type.slug == 'subflow':
+    flow = Flow(name=loads(node.node)['data'].get('flow', 'SubFlow'), workspace=node.workspace, description=loads(node.node)['data'].get('body', 'A subflow.'), default=False, slug=loads(node.node)['data']['slug'])
+    session.add(flow)
+    session.commit()
+
   updateFlowandWorksapceTS(node)
   session.commit()
   return {'node': node}

server/resolvers.py

@@ -1,16 +1,24 @@
+# import sys
+# sys.path.append('./dist')
+
 import json
 import asyncio
 import logging
 import aiohttp
 from aiohttp import web, ClientSession
-from ariadne import explorer, graphql_sync, ObjectType, MutationType, gql, load_schema_from_path, snake_case_fallback_resolvers, make_executable_schema
+from ariadne import graphql_sync, ObjectType, MutationType, gql, load_schema_from_path, snake_case_fallback_resolvers, make_executable_schema
+
+if __name__ == '__main__':
+  from ariadne import explorer
 
 from server.resolvers import *
 
 
 # Aiohttp webserver setup
 routes = web.RouteTableDef()
-explorer_html = explorer.ExplorerGraphiQL().html(None)
+if __name__ == '__main__':
+  explorer_html = explorer.ExplorerGraphiQL().html(None)
+
 HEADERS = {
   "Access-Control-Allow-Origin": "*",
   "Access-Control-Allow-Headers": "*",
@@ -73,7 +81,10 @@
 
 
 # Build schema
-type_defs = gql(load_schema_from_path("server/gql/"))
+if __name__ == '__main__' or __name__ == 'server.server':
+  type_defs = gql(load_schema_from_path("server/gql/"))
+else:
+  type_defs = gql(load_schema_from_path("gql/"))
 schema = make_executable_schema(
   type_defs, query, mutation, snake_case_fallback_resolvers
 )
@@ -102,27 +113,38 @@ async def graphql_api(request: web.Request) -> web.Response:
 async def graphql_api_options(_: web.Request) -> web.Response:
   return web.json_response({"message": "Accept all hosts"}, headers=HEADERS)
 
-@routes.route("*", "/{tail:.*}")
-async def proxy(request: web.Request) -> web.Response:
-  async with ClientSession() as session:
-    async with session.request(
-      method=request.method,
-      url=f"http://localhost:5173{request.path_qs}",
-      headers={key: value for key, value in request.headers.items()},
-      data=await request.read(),
-    ) as response:
-      return web.Response(
-        body=await response.read(),
-        status=response.status,
-        headers={key: value for key, value in response.headers.items()},
-      )
+# @routes.route("*", "/{tail:.*}")
+# async def proxy(request: web.Request) -> web.Response:
+#   async with ClientSession() as session:
+#     async with session.request(
+#       method=request.method,
+#       url=f"http://localhost:5173{request.path_qs}",
+#       headers={key: value for key, value in request.headers.items()},
+#       data=await request.read(),
+#     ) as response:
+#       return web.Response(
+#         body=await response.read(),
+#         status=response.status,
+#         headers={key: value for key, value in response.headers.items()},
+#       )
+
+# Server index.html file
+@routes.get('/')
+async def index(request: web.Request):
+  return web.FileResponse('index.html')
 
 # Web App initialization
 app = web.Application()
 app.add_routes(routes)
 
+def run_app():
+  logging.basicConfig(level=logging.WARNING)
+  asyncio.get_event_loop().set_debug(enabled=True) 
+  web.run_app(app, host='localhost', port=1212, shutdown_timeout=1)
+
 # Run the app
-if __name__ == '__main__':
+print(__name__)
+if __name__ == '__main__' or __name__ == 'server.server':
   logging.basicConfig(level=logging.DEBUG)
   asyncio.get_event_loop().set_debug(enabled=True) 
   web.run_app(app, host='localhost', port=1212, shutdown_timeout=1)