Handle variables that could be None

shinthor · Jul 26, 2023 · a870712 · a870712
1 parent 50da131
commit a870712
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/chainlit/client/local.py b/src/chainlit/client/local.py
@@ -95,11 +95,11 @@ async def get_conversation(self, conversation_id: str):
             where={"id": conversation_id}, include={"messages": True, "elements": True}
         )
 
-        for m in c.messages:
+        for m in c.messages or []:
             if m.llmSettings:
                 m.llmSettings = json.loads(m.llmSettings)
 
-        for e in c.elements:
+        for e in c.elements or []:
             if e.forIds:
                 e.forIds = json.loads(e.forIds)
 

diff --git a/src/chainlit/config.py b/src/chainlit/config.py
@@ -225,7 +225,13 @@ def load_module(target: str):
     sys.path.insert(0, target_dir)
 
     spec = util.spec_from_file_location(target, target)
+    if not spec or not spec.loader:
+        return
+
     module = util.module_from_spec(spec)
+    if not module:
+        return
+
     spec.loader.exec_module(module)
 
     sys.modules[target] = module