badfish 1.0.6__py3-none-any.whl → 1.1.0__py3-none-any.whl

badfish/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.1.0"

badfish/helpers/http_client.py

@@ -4,8 +4,8 @@ from typing import Any, Dict, Optional
 
 import aiohttp
 
-from src.badfish.helpers.async_lru import alru_cache
-from src.badfish.helpers.exceptions import BadfishException
+from async_lru import alru_cache
+from badfish.helpers.exceptions import BadfishException
 
 
 class HTTPClient:

badfish/main.py

@@ -13,11 +13,11 @@ import yaml
 import tempfile
 from urllib.parse import urlparse
 
-from src.badfish.helpers import get_now
-from src.badfish.helpers.parser import parse_arguments
-from src.badfish.helpers.logger import BadfishLogger
-from src.badfish.helpers.http_client import HTTPClient
-from src.badfish.helpers.exceptions import BadfishException
+from badfish.helpers import get_now
+from badfish.helpers.parser import parse_arguments
+from badfish.helpers.logger import BadfishLogger
+from badfish.helpers.http_client import HTTPClient
+from badfish.helpers.exceptions import BadfishException
 
 from logging import (
     DEBUG,
@@ -393,7 +393,7 @@ class Badfish:
 
         _uri = "%s%s" % (self.host_uri, session_uri)
         check_response = await self.http_client.get_request(_uri, _continue=True, _get_token=True)
-        if check_response is None:
+        if check_response is None or check_response.status != 200:
             session_uri = "/redfish/v1/SessionService/Sessions"
 
         return session_uri
@@ -2674,7 +2674,11 @@ def main(argv=None):
     output = _args["output"]
     bfl = BadfishLogger(_args["verbose"], multi_host, _args["log"], output)
 
-    loop = asyncio.get_event_loop()
+    try:
+        loop = asyncio.get_event_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
     tasks = []
     host_order = {}
     if host_list:

{badfish-1.0.6.dist-info → badfish-1.1.0.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: badfish
-Version: 1.0.6
+Version: 1.1.0
 Summary: Badfish is a Redfish-based API tool for managing bare-metal systems via the Redfish API
 Home-page: https://github.com/redhat-performance/badfish
 Author: Gonzalo Rafuls
 Author-email: gonza@redhat.com
-License: GPLv3
+License: GPL-3.0-or-later
 Project-URL: Bug Tracker, https://github.com/redhat-performance/badfish/issues
 Project-URL: Documentation, https://github.com/redhat-performance/badfish/blob/master/README.md
 Project-URL: Source Code, https://github.com/redhat-performance/badfish
@@ -24,8 +24,9 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyyaml>=3.10
-Requires-Dist: aiohttp>=3.7.4
+Requires-Dist: aiohttp>=3.10
 Requires-Dist: setuptools>=39.0
+Requires-Dist: async-lru>=2.0
 Dynamic: license-file
 
 <p align="center">
@@ -753,7 +754,6 @@ With rack, ULocation and blade being optional in a hierarchical fashion otherwis
 
 Please refer to our contributing [guide](CONTRIBUTING.md).
 
-
 * Here is some useful documentation
   - [Creating a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
   - [Keeping a cloned fork up to date](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork)

badfish-1.1.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+badfish/__init__.py,sha256=LGVQyDsWifdACo7qztwb8RWWHds1E7uQ-ZqD8SAjyw4,22
+badfish/config.py,sha256=lTkdP2mE3W7bYcnBSS7gwKvwqhcjm04_JemyQAac2iA,13
+badfish/main.py,sha256=yAIHpwGrdg4WyDkEkQB7kHVPArwt4UxC6O1qqgo5Iqk,114704
+badfish/helpers/__init__.py,sha256=PPiwRZmMOraluom_4xHo2txsWiKTp5pOb8VJkRoMtlI,73
+badfish/helpers/exceptions.py,sha256=00Es3q0VEkUMDiDt-FaNfEPMmXdILva4QqxAKFCLK3Y,44
+badfish/helpers/http_client.py,sha256=6rNxU0Qsg1vKAoiZ5di7H0AtxvayC3RRLLddYOgNHYU,9468
+badfish/helpers/logger.py,sha256=tVGzDVgspIA88uwJ1n9Ga89ut-sEguECJUzCJRm_Vbo,8405
+badfish/helpers/parser.py,sha256=ZId0VSA9zDnhpTjaXhBu4DS8IzdGuJGYaR3GN5EuvLI,8742
+badfish-1.1.0.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+badfish-1.1.0.dist-info/METADATA,sha256=3uKxU9lsngwZ6tt8A3zmh0Ti12uI_21W5T1uUafMUYM,40475
+badfish-1.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+badfish-1.1.0.dist-info/entry_points.txt,sha256=Fpg4ZrKAnJQfsL6KHFsFE-5z-RAUJPm-L1c0VVYPVBU,46
+badfish-1.1.0.dist-info/top_level.txt,sha256=-OHxYfrQDO7kPx6REmjwwVzwQ5QyMozHou-imfoME28,8
+badfish-1.1.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+badfish-1.1.0.dist-info/RECORD,,

{badfish-1.0.6.dist-info → badfish-1.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

badfish/helpers/async_lru.py

@@ -1,215 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2018 aio-libs team https://github.com/aio-libs/
-# Copyright (c) 2017 Ocean S. A. https://ocean.io/
-# Copyright (c) 2016-2017 WikiBusiness Corporation http://wikibusiness.org/
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-import asyncio
-from collections import OrderedDict
-from functools import _CacheInfo, _make_key, partial, wraps
-
-
-__version__ = "1.0.2"
-
-__all__ = ("alru_cache",)
-
-
-def unpartial(fn):
-    while hasattr(fn, "func"):
-        fn = fn.func
-
-    return fn
-
-
-def _done_callback(fut, task):
-    if task.cancelled():
-        fut.cancel()
-        return
-
-    exc = task.exception()
-    if exc is not None:
-        fut.set_exception(exc)
-        return
-
-    fut.set_result(task.result())
-
-
-def _cache_invalidate(wrapped, typed, *args, **kwargs):
-    key = _make_key(args, kwargs, typed)
-
-    exists = key in wrapped._cache
-
-    if exists:
-        wrapped._cache.pop(key)
-
-    return exists
-
-
-def _cache_clear(wrapped):
-    wrapped.hits = wrapped.misses = 0
-    wrapped._cache = OrderedDict()
-    wrapped.tasks = set()
-
-
-def _open(wrapped):
-    if not wrapped.closed:
-        raise RuntimeError("alru_cache is not closed")
-
-    was_closed = wrapped.hits == wrapped.misses == len(wrapped.tasks) == len(wrapped._cache) == 0
-
-    if not was_closed:
-        raise RuntimeError("alru_cache was not closed correctly")
-
-    wrapped.closed = False
-
-
-def _close(wrapped, *, cancel=False, return_exceptions=True):
-    if wrapped.closed:
-        raise RuntimeError("alru_cache is closed")
-
-    wrapped.closed = True
-
-    if cancel:
-        for task in wrapped.tasks:
-            if not task.done():  # not sure is it possible
-                task.cancel()
-
-    return _wait_closed(wrapped, return_exceptions=return_exceptions)
-
-
-async def _wait_closed(wrapped, *, return_exceptions):
-    wait_closed = asyncio.gather(*wrapped.tasks, return_exceptions=return_exceptions)
-
-    wait_closed.add_done_callback(partial(_close_waited, wrapped))
-
-    ret = await wait_closed
-
-    # hack to get _close_waited callback to be executed
-    await asyncio.sleep(0)
-
-    return ret
-
-
-def _close_waited(wrapped, _):
-    wrapped.cache_clear()
-
-
-def _cache_info(wrapped, maxsize):
-    return _CacheInfo(
-        wrapped.hits,
-        wrapped.misses,
-        maxsize,
-        len(wrapped._cache),
-    )
-
-
-def __cache_touch(wrapped, key):
-    try:
-        wrapped._cache.move_to_end(key)
-    except KeyError:  # not sure is it possible
-        pass
-
-
-def _cache_hit(wrapped, key):
-    wrapped.hits += 1
-    __cache_touch(wrapped, key)
-
-
-def _cache_miss(wrapped, key):
-    wrapped.misses += 1
-    __cache_touch(wrapped, key)
-
-
-def alru_cache(
-    fn=None,
-    maxsize=128,
-    typed=False,
-    *,
-    cache_exceptions=True,
-):
-    def wrapper(fn):
-        _origin = unpartial(fn)
-
-        if not asyncio.iscoroutinefunction(_origin):
-            raise RuntimeError("Coroutine function is required, got {}".format(fn))
-
-        # functools.partialmethod support
-        if hasattr(fn, "_make_unbound_method"):
-            fn = fn._make_unbound_method()
-
-        @wraps(fn)
-        async def wrapped(*fn_args, **fn_kwargs):
-            if wrapped.closed:
-                raise RuntimeError("alru_cache is closed for {}".format(wrapped))
-
-            loop = asyncio.get_event_loop()
-
-            key = _make_key(fn_args, fn_kwargs, typed)
-
-            fut = wrapped._cache.get(key)
-
-            if fut is not None:
-                if not fut.done():
-                    _cache_hit(wrapped, key)
-                    return await asyncio.shield(fut)
-
-                exc = fut._exception
-
-                if exc is None or cache_exceptions:
-                    _cache_hit(wrapped, key)
-                    return fut.result()
-
-                # exception here and cache_exceptions == False
-                wrapped._cache.pop(key)
-
-            fut = loop.create_future()
-            task = loop.create_task(fn(*fn_args, **fn_kwargs))
-            task.add_done_callback(partial(_done_callback, fut))
-
-            wrapped.tasks.add(task)
-            task.add_done_callback(wrapped.tasks.remove)
-
-            wrapped._cache[key] = fut
-
-            if maxsize is not None and len(wrapped._cache) > maxsize:
-                wrapped._cache.popitem(last=False)
-
-            _cache_miss(wrapped, key)
-            return await asyncio.shield(fut)
-
-        _cache_clear(wrapped)
-        wrapped._origin = _origin
-        wrapped.closed = False
-        wrapped.cache_info = partial(_cache_info, wrapped, maxsize)
-        wrapped.cache_clear = partial(_cache_clear, wrapped)
-        wrapped.invalidate = partial(_cache_invalidate, wrapped, typed)
-        wrapped.close = partial(_close, wrapped)
-        wrapped.open = partial(_open, wrapped)
-
-        return wrapped
-
-    if fn is None:
-        return wrapper
-
-    if callable(fn) or hasattr(fn, "_make_unbound_method"):
-        return wrapper(fn)
-
-    raise NotImplementedError("{} decorating is not supported".format(fn))

badfish-1.0.6.dist-info/RECORD

@@ -1,16 +0,0 @@
-badfish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-badfish/config.py,sha256=lTkdP2mE3W7bYcnBSS7gwKvwqhcjm04_JemyQAac2iA,13
-badfish/main.py,sha256=5YiLHSzI70wCtozRpOoXf2YJf3GTAw9j_wcuIXdVQiY,114577
-badfish/helpers/__init__.py,sha256=PPiwRZmMOraluom_4xHo2txsWiKTp5pOb8VJkRoMtlI,73
-badfish/helpers/async_lru.py,sha256=FFeu_ujkrzqaP1h4VmNrY4awBjC50c6z3cXcc41mS1U,5981
-badfish/helpers/exceptions.py,sha256=00Es3q0VEkUMDiDt-FaNfEPMmXdILva4QqxAKFCLK3Y,44
-badfish/helpers/http_client.py,sha256=Ml94tUhpHTeVIe8aFbRJ8ROuh-B4iBj3wU4z59p5zAg,9492
-badfish/helpers/logger.py,sha256=tVGzDVgspIA88uwJ1n9Ga89ut-sEguECJUzCJRm_Vbo,8405
-badfish/helpers/parser.py,sha256=ZId0VSA9zDnhpTjaXhBu4DS8IzdGuJGYaR3GN5EuvLI,8742
-badfish-1.0.6.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-badfish-1.0.6.dist-info/METADATA,sha256=I-I5_-9TntxZBhp-9UxHlp1pY8woFA-A7zQ78dJkOI0,40436
-badfish-1.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-badfish-1.0.6.dist-info/entry_points.txt,sha256=Fpg4ZrKAnJQfsL6KHFsFE-5z-RAUJPm-L1c0VVYPVBU,46
-badfish-1.0.6.dist-info/top_level.txt,sha256=-OHxYfrQDO7kPx6REmjwwVzwQ5QyMozHou-imfoME28,8
-badfish-1.0.6.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-badfish-1.0.6.dist-info/RECORD,,