python-argtools 0.0.2__tar.gz → 0.0.4__tar.gz

{python_argtools-0.0.2 → python_argtools-0.0.4}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-argtools
-Version: 0.0.2
+Version: 0.0.4
 Summary: Python argument tools.
-Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-argtools
 License: MIT
+License-File: LICENSE
 Keywords: argument,tools
 Author: ChenyangGao
 Author-email: wosiwujm@gmail.com
@@ -16,11 +16,13 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Project-URL: Repository, https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-argtools
+Project-URL: Homepage, https://github.com/ChenyangGao/python-modules/tree/main/python-argtools
+Project-URL: Repository, https://github.com/ChenyangGao/python-modules/tree/main/python-argtools
 Description-Content-Type: text/markdown
 
 # Python argument tools.
@@ -30,7 +32,7 @@ Description-Content-Type: text/markdown
 You can install from [pypi](https://pypi.org/project/python-argtools/)
 
 ```console
-pip install -U argtools
+pip install -U python-argtools
 ```
 
 ## Usage

{python_argtools-0.0.2 → python_argtools-0.0.4}/argtools/__init__.py

@@ -6,23 +6,45 @@ some arguments at one time and then use them repeatedly later.
 """
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 2)
-__all__ = ["argcount", "Args", "UpdativeArgs", "Call"]
+__version__ = (0, 0, 4)
+__all__ = ["argcount", "has_keyword_arg", "Args", "UpdativeArgs", "Call"]
 
 from collections.abc import Callable
 from copy import copy
 from functools import partial, update_wrapper
-from inspect import getfullargspec
-from typing import cast, Any
+from inspect import getfullargspec, signature, Parameter
+from types import MethodType, MethodWrapperType
+from typing import Any
 
 
 def argcount(func: Callable, /) -> int:
     if isinstance(func, partial):
         return max(0, argcount(func.func) - len(func.args))
+    is_method = isinstance(func, (MethodType, MethodWrapperType))
     try:
-        return func.__code__.co_argcount
+        return func.__code__.co_argcount - is_method
     except AttributeError:
-        return len(getfullargspec(func).args)
+        return len(getfullargspec(func).args) - is_method
+
+
+def has_keyword_arg(func: Callable, arg_name: str, /) -> bool:
+    try:
+        sig = signature(func)
+    except ValueError:
+        try:
+            arg_spec = getfullargspec(func)
+            return bool(arg_spec.varkw or arg_name in arg_spec.kwonlyargs)
+        except TypeError:
+            return False
+    else:
+        for name, param in sig.parameters.items():
+            match param.kind:
+                case Parameter.POSITIONAL_OR_KEYWORD | Parameter.KEYWORD_ONLY:
+                    if name == arg_name:
+                        return True
+                case Parameter.VAR_KEYWORD:
+                    return True
+        return False
 
 
 class Args:
@@ -53,6 +75,25 @@ class Args:
             return self.args == other.args and self.kwargs == other.kwargs
         return False
 
+    def __getitem__(self, idx: int | slice | str | tuple[int | slice | str, ...], /):
+        cls = type(self)
+        pget = self.args.__getitem__
+        if isinstance(idx, (int, slice)):
+            return cls(pget(idx))
+        kget = self.kwargs.__getitem__
+        if isinstance(idx, str):
+            return cls(idx=kget(idx))
+        else:
+            pargs: list = []
+            kargs: dict = {}
+            add_parg = pargs.append
+            for idx_ in idx:
+                if isinstance(idx_, (int, slice)):
+                    add_parg(pget(idx_))
+                else:
+                    kargs[idx_] = kget(idx_)
+            return cls(*pargs, **kargs)
+
     def __iter__(self, /):
         return iter((self.args, self.kwargs))
 
@@ -281,19 +322,19 @@ class Call[**Params, R](partial):
         **kwds: Params.kwargs, 
     ):
         if hasattr(func, "func"):
-            args = cast(Params.args, getattr(func, "args", ()) + args)
+            args = getattr(func, "args", ()) + args # type: ignore
             kwargs: None | dict = None
             try:
                 kwargs = getattr(func, "kwargs")
             except AttributeError:
                 kwargs = getattr(func, "keywords", None)
             if kwargs:
-                kwds = cast(Params.kwargs, {**kwargs, **kwds})
+                kwds = {**kwargs, **kwds} # type: ignore
             func = func.func
         return update_wrapper(super().__new__(cls, func, *args, **kwds), func)
 
     @property
-    def kwargs(self, /) -> Params.kwargs:
+    def kwargs(self, /) -> dict:
         return self.keywords
 
     def __call__(self, /) -> R:

{python_argtools-0.0.2 → python_argtools-0.0.4}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "python-argtools"
-version = "0.0.2"
+version = "0.0.4"
 description = "Python argument tools."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
 readme = "readme.md"
-homepage = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-argtools"
-repository = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-argtools"
+homepage = "https://github.com/ChenyangGao/python-modules/tree/main/python-argtools"
+repository = "https://github.com/ChenyangGao/python-modules/tree/main/python-argtools"
 keywords = ["argument", "tools"]
 classifiers = [
     "License :: OSI Approved :: MIT License",

{python_argtools-0.0.2 → python_argtools-0.0.4}/readme.md

@@ -5,7 +5,7 @@
 You can install from [pypi](https://pypi.org/project/python-argtools/)
 
 ```console
-pip install -U argtools
+pip install -U python-argtools
 ```
 
 ## Usage