From 15d21b66d7ffae04ecb8485001639a766d3e0f56 Mon Sep 17 00:00:00 2001
From: doctorpangloss <@hiddenswitch.com>
Date: Mon, 15 Jul 2024 10:46:05 -0700
Subject: [PATCH] Fix stray folder_paths file; improve node importing errors

---
 comfy/cli_args_types.py   | 2 --
 comfy/cmd/folder_paths.py | 1 +
 comfy/nodes/package.py    | 3 ++-
 folder_paths.py           | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 folder_paths.py

diff --git a/comfy/cli_args_types.py b/comfy/cli_args_types.py
index bc57a583d..79d971ad9 100644
--- a/comfy/cli_args_types.py
+++ b/comfy/cli_args_types.py
@@ -1,7 +1,5 @@
-# Define a class for your command-line arguments
 from __future__ import annotations
 
-import copy
 import enum
 from typing import Optional, List, Callable, Any, Union, Mapping, NamedTuple
 
diff --git a/comfy/cmd/folder_paths.py b/comfy/cmd/folder_paths.py
index 84457015b..32c5c3c54 100644
--- a/comfy/cmd/folder_paths.py
+++ b/comfy/cmd/folder_paths.py
@@ -29,6 +29,7 @@ class FolderPathsTuple:
 
     def __add__(self, other: "FolderPathsTuple"):
         assert self.folder_name == other.folder_name
+        # todo: make sure the paths are actually unique, as this method intends
         new_paths = list(frozenset(self.paths + other.paths))
         new_supported_extensions = self.supported_extensions | other.supported_extensions
         return FolderPathsTuple(self.folder_name, new_paths, new_supported_extensions)
diff --git a/comfy/nodes/package.py b/comfy/nodes/package.py
index 4179482af..2319d7b16 100644
--- a/comfy/nodes/package.py
+++ b/comfy/nodes/package.py
@@ -46,12 +46,13 @@ def _import_and_enumerate_nodes_in_module(module: types.ModuleType,
     exceptions = []
     with tracer.start_as_current_span("Load Node") as span:
         time_before = time.perf_counter()
+        full_name = module.__name__
         try:
             module_decl = _import_nodes_in_module(exported_nodes, module)
-            full_name = module.__name__
             span.set_attribute("full_name", full_name)
             timings.append((time.perf_counter() - time_before, full_name, True, exported_nodes))
         except Exception as exc:
+            module_decl = None
             logging.error(f"{full_name} import failed", exc_info=exc)
             span.set_status(Status(StatusCode.ERROR))
             span.record_exception(exc)
diff --git a/folder_paths.py b/folder_paths.py
deleted file mode 100644
index e69de29bb..000000000