From 1bdd64ae3de81473796ed52ac3f59dde47fca55b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 25 Jul 2025 17:03:17 +0200
Subject: [PATCH 1/3] allow path to python file

---
 client/ayon_core/pipeline/publish/lib.py | 37 +++++++++++++-----------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py
index fb84417730..ddb1c46def 100644
--- a/client/ayon_core/pipeline/publish/lib.py
+++ b/client/ayon_core/pipeline/publish/lib.py
@@ -243,32 +243,35 @@ def publish_plugins_discover(
 
     for path in paths:
         path = os.path.normpath(path)
-        if not os.path.isdir(path):
-            continue
+        filenames = []
+        if os.path.isdir(path):
+            filenames.extend(
+                name
+                for name in os.listdir(path)
+                if (
+                    os.path.isfile(os.path.join(path, name))
+                    and not name.startswith("_")
+                )
+            )
+        else:
+            filenames.append(os.path.basename(path))
+            path = os.path.dirname(path)
 
-        for fname in os.listdir(path):
-            if fname.startswith("_"):
-                continue
-
-            abspath = os.path.join(path, fname)
-
-            if not os.path.isfile(abspath):
-                continue
-
-            mod_name, mod_ext = os.path.splitext(fname)
-
-            if mod_ext != ".py":
+        for filename in filenames:
+            mod_name, mod_ext = os.path.splitext(filename)
+            if mod_ext.lower() != ".py":
                 continue
 
+            filepath = os.path.join(path, filename)
             try:
                 module = import_filepath(
-                    abspath, mod_name, sys_module_name=mod_name)
+                    filepath, mod_name, sys_module_name=mod_name
 
             except Exception as err:  # noqa: BLE001
                 # we need broad exception to catch all possible errors.
-                result.crashed_file_paths[abspath] = sys.exc_info()
+                result.crashed_file_paths[filepath] = sys.exc_info()
 
-                log.debug('Skipped: "%s" (%s)', mod_name, err)
+                log.debug('Skipped: "%s" (%s)', filepath, err)
                 continue
 
             for plugin in pyblish.plugin.plugins_from_module(module):

From c398e1fca35c5c379acb53b1c47bce8a493affb9 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 25 Jul 2025 17:03:37 +0200
Subject: [PATCH 2/3] hash dirpath for sys modules

---
 client/ayon_core/pipeline/publish/lib.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py
index ddb1c46def..c0b138c7f2 100644
--- a/client/ayon_core/pipeline/publish/lib.py
+++ b/client/ayon_core/pipeline/publish/lib.py
@@ -5,6 +5,7 @@ import sys
 import inspect
 import copy
 import warnings
+import hashlib
 import xml.etree.ElementTree
 from typing import TYPE_CHECKING, Optional, Union, List
 
@@ -257,15 +258,18 @@ def publish_plugins_discover(
             filenames.append(os.path.basename(path))
             path = os.path.dirname(path)
 
+        dirpath_hash = hashlib.md5(path.encode("utf-8")).hexdigest()
         for filename in filenames:
             mod_name, mod_ext = os.path.splitext(filename)
             if mod_ext.lower() != ".py":
                 continue
 
             filepath = os.path.join(path, filename)
+            sys_module_name = f"{dirpath_hash}.{mod_name}"
             try:
                 module = import_filepath(
-                    filepath, mod_name, sys_module_name=mod_name
+                    filepath, mod_name, sys_module_name=sys_module_name
+                )
 
             except Exception as err:  # noqa: BLE001
                 # we need broad exception to catch all possible errors.

From cdb719494ef86728f22440e137320e2aa91c6216 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 25 Jul 2025 17:19:26 +0200
Subject: [PATCH 3/3] use same name for both sys module and module

---
 client/ayon_core/pipeline/publish/lib.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py
index c0b138c7f2..d360526024 100644
--- a/client/ayon_core/pipeline/publish/lib.py
+++ b/client/ayon_core/pipeline/publish/lib.py
@@ -260,15 +260,15 @@ def publish_plugins_discover(
 
         dirpath_hash = hashlib.md5(path.encode("utf-8")).hexdigest()
         for filename in filenames:
-            mod_name, mod_ext = os.path.splitext(filename)
-            if mod_ext.lower() != ".py":
+            basename, ext = os.path.splitext(filename)
+            if ext.lower() != ".py":
                 continue
 
             filepath = os.path.join(path, filename)
-            sys_module_name = f"{dirpath_hash}.{mod_name}"
+            module_name = f"{dirpath_hash}.{basename}"
             try:
                 module = import_filepath(
-                    filepath, mod_name, sys_module_name=sys_module_name
+                    filepath, module_name, sys_module_name=module_name
                 )
 
             except Exception as err:  # noqa: BLE001