ygo 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl

ygo/__init__.py

@@ -1,12 +1,3 @@
-# -*- coding: utf-8 -*-
-"""
----------------------------------------------
-Created on 2025/4/28 15:25
-@author: ZhangYundi
-@email: yundi.xxii@outlook.com
----------------------------------------------
-"""
-
 from .exceptions import FailTaskError, WarnException
 from .pool import pool
 from .delay import delay
@@ -18,10 +9,11 @@ from .utils import (
     fn_info,
     module_from_str,
     fn_from_str,
+    locate,
 )
 from .lazy import lazy_import
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 __all__ = [
     "FailTaskError",

ygo/lazy.py

@@ -10,7 +10,7 @@ Description:
 """
 
 from typing import Any
-from hydra._internal.utils import _locate
+from .utils import locate
 
 class LazyImport:
     def __init__(self, full_name: str):
@@ -19,7 +19,7 @@ class LazyImport:
 
     def _load(self) -> Any:
         if self._obj is None:
-            self._obj = _locate(self._full_name)
+            self._obj = locate(self._full_name)
         return self._obj
 
     def __getattr__(self, attr: str) -> Any:

ygo/pool.py

@@ -12,7 +12,7 @@ import threading
 import warnings
 
 from joblib import Parallel, delayed
-import tolog
+import logair
 from .exceptions import WarnException, FailTaskError
 from .delay import delay
 
@@ -20,7 +20,7 @@ with warnings.catch_warnings():
     warnings.simplefilter("ignore")
     from tqdm.auto import tqdm
 
-logger = tolog.get_logger("ygo")
+logger = logair.get_logger("ygo")
 
 def run_job(job, task_id, queue):
     """执行任务并更新队列"""

ygo/utils.py

@@ -12,6 +12,8 @@ import os
 from functools import wraps
 from pathlib import Path
 import warnings
+from typing import Any
+
 from .delay import delay
 
 def deprecated(use_instead: str = None):
@@ -169,3 +171,60 @@ def module_from_str(s):
     m_path = ".".join(s.split('.'))
     mod = importlib.import_module(m_path)
     return mod
+
+def locate(path: str) -> Any:
+    """
+    Notes
+    -----
+    Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
+
+    Locate an object by name or dotted path, importing as necessary.
+    This is similar to the pydoc function `locate`, except that it checks for
+    the module from the given path from back to front.
+    """
+    if path == "":
+        raise ImportError("Empty path")
+    from importlib import import_module
+    from types import ModuleType
+
+    parts = [part for part in path.split(".")]
+    for part in parts:
+        if not len(part):
+            raise ValueError(
+                f"Error loading '{path}': invalid dotstring."
+                + "\nRelative imports are not supported."
+            )
+    assert len(parts) > 0
+    part0 = parts[0]
+    try:
+        obj = import_module(part0)
+    except Exception as exc_import:
+        raise ImportError(
+            f"Error loading '{path}':\n{repr(exc_import)}"
+            + f"\nAre you sure that module '{part0}' is installed?"
+        ) from exc_import
+    for m in range(1, len(parts)):
+        part = parts[m]
+        try:
+            obj = getattr(obj, part)
+        except AttributeError as exc_attr:
+            parent_dotpath = ".".join(parts[:m])
+            if isinstance(obj, ModuleType):
+                mod = ".".join(parts[: m + 1])
+                try:
+                    obj = import_module(mod)
+                    continue
+                except ModuleNotFoundError as exc_import:
+                    raise ImportError(
+                        f"Error loading '{path}':\n{repr(exc_import)}"
+                        + f"\nAre you sure that '{part}' is importable from module '{parent_dotpath}'?"
+                    ) from exc_import
+                except Exception as exc_import:
+                    raise ImportError(
+                        f"Error loading '{path}':\n{repr(exc_import)}"
+                    ) from exc_import
+            raise ImportError(
+                f"Error loading '{path}':\n{repr(exc_attr)}"
+                + f"\nAre you sure that '{part}' is an attribute of '{parent_dotpath}'?"
+            ) from exc_attr
+    return obj

{ygo-1.2.1.dist-info → ygo-1.2.2.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: ygo
-Version: 1.2.1
+Version: 1.2.2
 Summary: 一个轻量级 Python 工具包，支持 并发执行（带进度条）、延迟调用、链式绑定参数、函数信息获取、模块/函数动态加载。并结合 ylog 提供日志记录能力
 Project-URL: homepage, https://github.com/link-yundi/ygo
 Project-URL: repository, https://github.com/link-yundi/ygo
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: hydra-core>=1.3.2
 Requires-Dist: joblib>=1.5.0
 Requires-Dist: logair>=1.0.0
 Requires-Dist: tqdm>=4.67.1

ygo-1.2.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+ygo/__init__.py,sha256=07iVluTLno91MFhAoKWRlZIxl2ll7huPTvYS5WCsxbw,536
+ygo/delay.py,sha256=66xtPXqyD630FL7LWL5qJKAIZvyGDwZyM4qPfk8Czlg,2206
+ygo/exceptions.py,sha256=0OYDYt_9KKo8mF2XBG5QkCMr3-ASp69VDSPOEwlIsrI,660
+ygo/lazy.py,sha256=NRE38vWKfA19fTRIbgCypdoxXhJulDtHMd7jw6CzhUc,1303
+ygo/pool.py,sha256=fUl_v4GOU310TDqfpUPNJdjovCZwkbBP5xUdqd8jZvk,7095
+ygo/utils.py,sha256=45ZM7FUraDA69jwf1arbBuuS-a0wMVf9sT7ma5bGd4E,6224
+ygo-1.2.2.dist-info/licenses/LICENSE,sha256=6AKUWQ1xe-jwPSFv_H6FMQLNNWb7AYqzuEUTwlP2S8M,1067
+ygo-1.2.2.dist-info/METADATA,sha256=EJ9sZyLDIbET52fq06GTI1MknSUDwnYcDeJQy-7a6kc,4844
+ygo-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ygo-1.2.2.dist-info/top_level.txt,sha256=4E07GOD3KS5--r4rP13upXfTEgk3JGJpQmMkdkJ4t74,4
+ygo-1.2.2.dist-info/RECORD,,

ygo-1.2.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-ygo/__init__.py,sha256=GTzTj7-07IBBiWq4hUFZ1qWgDjK6DK0DKUaoc5bwZv8,727
-ygo/delay.py,sha256=66xtPXqyD630FL7LWL5qJKAIZvyGDwZyM4qPfk8Czlg,2206
-ygo/exceptions.py,sha256=0OYDYt_9KKo8mF2XBG5QkCMr3-ASp69VDSPOEwlIsrI,660
-ygo/lazy.py,sha256=IwWOv3zYWGGuFefvZwZyP-zokyB4EnQWmySstSk3dJg,1320
-ygo/pool.py,sha256=mnao2KtJUKgjSfqdCSZVVGXPrrz_0W-0OzBUjFKsVjk,7093
-ygo/utils.py,sha256=paeYb8TwonIaDwusE6YV9v_-Y-WzVjGgSa_c1mblw3Y,4040
-ygo-1.2.1.dist-info/licenses/LICENSE,sha256=6AKUWQ1xe-jwPSFv_H6FMQLNNWb7AYqzuEUTwlP2S8M,1067
-ygo-1.2.1.dist-info/METADATA,sha256=RR16W4wEyOYoGD_B-8gw1r8mYsAENSlRsPMYvSXhIQM,4877
-ygo-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ygo-1.2.1.dist-info/top_level.txt,sha256=4E07GOD3KS5--r4rP13upXfTEgk3JGJpQmMkdkJ4t74,4
-ygo-1.2.1.dist-info/RECORD,,