hcs-core 0.1.303__tar.gz → 0.1.305__tar.gz

{hcs_core-0.1.303 → hcs_core-0.1.305}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.303
+Version: 0.1.305
 Summary: Horizon Cloud Service CLI module.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues

hcs_core-0.1.305/hcs_core/__init__.py

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

{hcs_core-0.1.303 → hcs_core-0.1.305}/hcs_core/util/query_util.py

@@ -40,7 +40,11 @@ def with_query(url: str, **kwargs: Any) -> str:
 class PageRequest:
     def __init__(self, fn_get_page: Callable, fn_filter: Callable = None, **kwargs):
         limit = kwargs.get("limit")
-        self.limit = int(limit) if limit else 10
+        if limit is None or limit == "":
+            limit = 10
+        else:
+            limit = int(limit)
+        self.limit = limit
         self.fn_get_page = fn_get_page
         self.fn_filter = fn_filter
         self.query = _remove_none(dict(kwargs))
@@ -57,12 +61,14 @@ class PageRequest:
         params["size"] = size
 
         query_string = urlencode(params)
-        page = self.fn_get_page(query_string)
-        if not page or not page.content:
+        page_data = self.fn_get_page(query_string)
+        if not page_data or not page_data.content:
             return [], False
+        content = page_data.content
         if self.fn_filter:
-            return list(filter(self.fn_filter, page.content)), True
-        return page.content, True
+            content = list(filter(self.fn_filter, content))
+        has_next = page_data.get("totalPages", 0) > page + 1
+        return content, has_next
 
     def get(self) -> list:
         ret = []
@@ -83,12 +89,15 @@ class PageRequest:
             else:
                 content = page.content
             ret += content
-            if len(ret) > self.limit:
+            if self.limit > 0 and len(ret) > self.limit:
                 ret = ret[: self.limit]
                 break
-            if len(page.content) < self.query["size"]:
-                break  # no more items
+            # if len(page.content) < self.query["size"]:
+            #     break  # no more items
+            total_pages = page.get("totalPages", 0)
             page_index += 1
+            if page_index >= total_pages:
+                break
 
         return ret
 

hcs_core-0.1.303/hcs_core/__init__.py

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