From a8275dc3b165beb3d87f269eae9c2258953d3cb4 Mon Sep 17 00:00:00 2001
From: Heiru Wu <heiru.wu@instill.tech>
Date: Fri, 19 Jul 2024 01:11:17 +0800
Subject: [PATCH] fix(ray): avoid protogen module name collision with model.py

---
 instill/__init__.py           | 13 +++++++++++--
 instill/helpers/ray_io.py     |  2 +-
 instill/resources/__init__.py | 32 --------------------------------
 3 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/instill/__init__.py b/instill/__init__.py
index 2ecb204..56f082b 100644
--- a/instill/__init__.py
+++ b/instill/__init__.py
@@ -1,4 +1,4 @@
-# pylint: disable=no-name-in-module
+# pylint: disable=no-name-in-module,wrong-import-position
 import os
 import sys
 from importlib.metadata import PackageNotFoundError, version
@@ -7,7 +7,16 @@
 
 Logger.initialize()
 
-sys.path.append(os.path.join(os.path.dirname(__file__), "protogen"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "protogen"))
+
+# protogen `model` package collides with `model.py`
+# temporarily remove current directory from sys.path
+# and import ray_io
+if "" in sys.path:
+    sys.path.remove("")
+    import instill.helpers.ray_io
+
+    sys.path.insert(0, "")
 
 try:
     __version__ = version("instill-sdk")
diff --git a/instill/helpers/ray_io.py b/instill/helpers/ray_io.py
index 5de4ba6..61a3f30 100644
--- a/instill/helpers/ray_io.py
+++ b/instill/helpers/ray_io.py
@@ -1,4 +1,4 @@
-# pylint: disable=no-member,no-name-in-module, inconsistent-return-statements
+# pylint: disable=no-member,no-name-in-module, inconsistent-return-statements, unused-import
 import base64
 import io
 import re
diff --git a/instill/resources/__init__.py b/instill/resources/__init__.py
index 2ddf9eb..a37577c 100644
--- a/instill/resources/__init__.py
+++ b/instill/resources/__init__.py
@@ -1,35 +1,3 @@
-import instill.protogen.common.task.v1alpha.task_pb2 as task
-import instill.protogen.model.model.v1alpha.model_pb2 as model_pb
-import instill.protogen.model.model.v1alpha.task_classification_pb2 as task_classification
-import instill.protogen.model.model.v1alpha.task_detection_pb2 as task_detection
-import instill.protogen.model.model.v1alpha.task_keypoint_pb2 as task_keypoint
-import instill.protogen.model.model.v1alpha.task_ocr_pb2 as task_ocr
-import instill.protogen.model.model.v1alpha.task_semantic_segmentation_pb2 as task_semantic_segmentation
-import instill.protogen.model.model.v1alpha.task_text_generation_pb2 as task_text_generation
-import instill.protogen.model.model.v1alpha.task_text_to_image_pb2 as task_text_to_image
-import instill.protogen.vdp.pipeline.v1beta.pipeline_pb2 as pipeline_pb
-
-# from instill.resources.connector_ai import (
-#     HuggingfaceConnector,
-#     InstillModelConnector,
-#     OpenAIConnector,
-#     StabilityAIConnector,
-# )
-# from instill.resources.connector_blockchain import NumbersConnector
-# from instill.resources.connector_data import (
-#     BigQueryConnector,
-#     GoogleCloudStorageConnector,
-#     GoogleSearchConnector,
-#     PineconeConnector,
-#     RedisConnector,
-#     WebsiteConnector,
-# )
-# from instill.resources.operator import (
-#     Base64Operator,
-#     ImageOperator,
-#     JSONOperator,
-#     TextOperator,
-# )
 from instill.resources.model import Model
 from instill.resources.pipeline import Pipeline
 from instill.resources.schema.helper import populate_default_value