fix fake imports

Author: fjxmlzn

pe/__init__.py

@@ -1,8 +1,5 @@
-import generalimport
 from generalimport import generalimport as optionalimport
 
-# This is a temporary hack to support libraries such as azure.identity
-generalimport.top._assert_no_dots = lambda names: ...
 
 optionalimport(
     "blobfile",
@@ -21,7 +18,6 @@
     "gdown",
     "openai",
     "tenacity",
-    "azure.identity",
     "tiktoken",
     "dotenv",
     "sentence_transformers",

pe/llm/huggingface/__init__.py

@@ -1,3 +1,6 @@
+from generalimport import is_imported
 from .register_fastchat.gpt2 import register as register_gpt2
 
-register_gpt2()
+
+if is_imported("fastchat"):
+    register_gpt2()

pe/llm/huggingface/register_fastchat/gpt2.py

@@ -6,21 +6,21 @@
 from fastchat.conversation import SeparatorStyle
 
 
-class GPT2Adapter(BaseModelAdapter):
-    """The GPT-2 model adapter for fastchat."""
+def register():
+    """Register the GPT-2 model adapter for fastchat."""
 
-    def match(self, model_path):
-        return "gpt2" in model_path.lower()
+    class GPT2Adapter(BaseModelAdapter):
+        """The GPT-2 model adapter for fastchat."""
 
-    def load_model(self, model_path, from_pretrained_kwargs):
-        raise NotImplementedError
+        def match(self, model_path):
+            return "gpt2" in model_path.lower()
 
-    def get_default_conv_template(self, model_path):
-        return get_conv_template("gpt2")
+        def load_model(self, model_path, from_pretrained_kwargs):
+            raise NotImplementedError
 
+        def get_default_conv_template(self, model_path):
+            return get_conv_template("gpt2")
 
-def register():
-    """Register the GPT-2 model adapter for fastchat."""
     register_conv_template(
         Conversation(
             name="gpt2",

pyproject.toml

@@ -20,30 +20,26 @@ dependencies = [
   "pandas",
   "scikit-learn",
   "generalimport",
+  "fld@git+https://github.com/marcojira/fld.git",
+  "openai",
+  "tenacity",
 ]
 
 [project.optional-dependencies]
-dev = [
-  "pre-commit",
-  "black",
-  "sphinx",
-  "sphinx-rtd-theme",
-  "sphinx-toolbox",
-]
+dev = ["pre-commit", "black", "sphinx", "sphinx-rtd-theme", "sphinx-toolbox"]
 image = [
   "blobfile",
   "torch",
   "imageio",
-  "clip@git+https://github.com/openai/CLIP.git@dcba3cb2e2827b402d2701e7e1c7d9fed8a20ef1",
+  "clip@git+https://github.com/openai/CLIP.git",
   "diffusers[pytorch]",
+  "transformers",
   "improved-diffusion@git+https://github.com/fjxmlzn/improved-diffusion.git@8f6677c3c47d1c1ad2e22ad2603eaec4cc639805",
   "wilds",
+  "azure-identity",
 ]
 text = [
   "gdown",
-  "openai",
-  "tenacity",
-  "azure-identity",
   "tiktoken",
   "python-dotenv",
   "sentence-transformers",
@@ -52,7 +48,8 @@ text = [
   "fschat",
   "transformers",
   "accelerate",
-  "tqdm"
+  "tqdm",
+  "azure-identity",
 ]
 
 [project.urls]