Merge pull request #14 from offish/v2.0.8

more methods

Author: offish

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 88
+extend-ignore = E203, E704

src/tf2_utils/__init__.py

@@ -1,13 +1,36 @@
 __title__ = "tf2-utils"
 __author__ = "offish"
-__version__ = "2.0.7"
+__version__ = "2.0.8"
 __license__ = "MIT"
 
-from .sku import get_sku, get_sku_properties, sku_to_defindex
+from .sku import (
+    get_sku,
+    get_sku_properties,
+    sku_to_defindex,
+    sku_to_quality,
+    sku_is_uncraftable,
+)
 from .item import Item
 from .offer import Offer
-from .utils import to_refined, to_scrap, refinedify, account_id_to_steam_id
+from .utils import (
+    to_refined,
+    to_scrap,
+    refinedify,
+    account_id_to_steam_id,
+    steam_id_to_account_id,
+    get_account_id_from_trade_url,
+    get_steam_id_from_trade_url,
+    get_token_from_trade_url,
+)
 from .schema import SchemaItemsUtils
 from .sockets import BackpackTFSocket, PricesTFSocket
-from .prices_tf import PricesTF
+from .prices_tf import (
+    PricesTF,
+    PricesTFError,
+    RateLimited,
+    EmptyResponse,
+    InternalServerError,
+)
 from .inventory import Inventory, map_inventory
+
+# flake8: noqa

src/tf2_utils/inventory.py

@@ -58,5 +58,5 @@ def fetch(self, steam_id: str, app_id: int = 440, context_id: int = 2) -> dict:
 
         try:
             return response.json()
-        except:
-            return {}
+        except Exception as e:
+            return {"error": str(e)}

src/tf2_utils/prices_tf.py

@@ -1,5 +1,7 @@
-from websockets.sync.client import connect
 import requests
+import time
+
+from .utils import to_refined
 
 
 class PricesTFError(Exception):
@@ -75,6 +77,55 @@ def get_price(self, sku: str) -> dict:
     def get_prices(self, page: int, limit: int = 100, order: str = "DESC") -> dict:
         return self.__get("/prices", {"page": page, "limit": limit, "order": order})
 
+    def format_price(self, data: dict) -> dict:
+        return {
+            "buy": {
+                "keys": data["buyKeys"],
+                "metal": to_refined(data["buyHalfScrap"] / 2),
+            },
+            "sell": {
+                "keys": data["sellKeys"],
+                "metal": to_refined(data["sellHalfScrap"] / 2),
+            },
+        }
+
+    def get_prices_till_page(
+        self, page_limit: int, print_rate_limit: bool = False
+    ) -> dict:
+        prices = {}
+        current_page = 1
+        # set higher than current page first time
+        max_page = page_limit if page_limit != -1 else 2
+
+        while current_page < max_page:
+            try:
+                response = self.prices_tf.get_prices(current_page)
+            except RateLimited:
+                timeout = 60
+
+                if print_rate_limit:
+                    print(f"rate limited from prices.tf, waiting {timeout} seconds")
+
+                time.sleep(timeout)
+                continue
+
+            if "items" not in response:
+                raise PricesTFError("could not find any items in response")
+
+            for item in response["items"]:
+                prices[item["sku"]] = self.format_price(item)
+
+            current_page = response["meta"]["currentPage"] + 1
+            total_pages = response["meta"]["totalPages"]
+
+            if page_limit == -1:
+                max_page = total_pages
+
+        return prices
+
+    def get_all_prices(self, print_rate_limit: bool = False) -> dict:
+        return self.get_prices_till_page(-1, print_rate_limit)
+
     def update_price(self, sku: str) -> tuple[dict, int]:
         return self.__post(f"/prices/{sku}/refresh")
 

src/tf2_utils/providers/steamapis.py

@@ -5,7 +5,8 @@ def __init__(self, api_key: str) -> None:
     def get_url_and_params(
         self, steam_id: str, app_id: int, context_id: int
     ) -> tuple[str, dict]:
+        url = "https://api.steamapis.com/steam/inventory/{}/{}/{}"
         return (
-            f"https://api.steamapis.com/steam/inventory/{steam_id}/{app_id}/{context_id}",
+            url.format(steam_id, app_id, context_id),
             {"api_key": self.api_key},
         )

src/tf2_utils/sku.py

@@ -46,8 +46,20 @@ def get_sku_properties(item: Item | dict) -> dict:
     return sku_properties
 
 
+def get_property(sku: str, index: int) -> str:
+    return sku.split(";")[index]
+
+
 def sku_to_defindex(sku: str) -> int:
-    return int(sku.split(";")[:-1][0])
+    return int(get_property(sku, 0))
+
+
+def sku_to_quality(sku: str) -> int:
+    return int(get_property(sku, 1))
+
+
+def sku_is_uncraftable(sku: str) -> bool:
+    return sku.find(";uncraftable") != -1
 
 
 def get_sku(item: Item | dict) -> str:

src/tf2_utils/utils.py

@@ -28,5 +28,24 @@ def refinedify(value: float) -> float:
     return math.floor((round(value * 9, 0) * 100) / 9) / 100
 
 
+def get_account_id_from_trade_url(trade_url: str) -> str:
+    partner_index = trade_url.index("?partner=") + 9
+    token_index = trade_url.index("&token=")
+    return trade_url[partner_index:token_index]
+
+
+def get_steam_id_from_trade_url(trade_url: str) -> str:
+    return account_id_to_steam_id(get_account_id_from_trade_url(trade_url))
+
+
+def get_token_from_trade_url(trade_url: str) -> str:
+    token_index = trade_url.index("&token=") + 7
+    return trade_url[token_index:]
+
+
 def account_id_to_steam_id(account_id: int | str) -> str:
     return str(76561197960265728 + int(account_id))
+
+
+def steam_id_to_account_id(steam_id: str | int) -> str:
+    return str(int(steam_id) - 76561197960265728)

tests/test_sku.py

@@ -1,5 +1,11 @@
 from src.tf2_utils.utils import read_json_file
-from src.tf2_utils import get_sku, get_sku_properties
+from src.tf2_utils import (
+    get_sku,
+    get_sku_properties,
+    sku_to_defindex,
+    sku_to_quality,
+    sku_is_uncraftable,
+)
 
 from unittest import TestCase
 
@@ -57,3 +63,10 @@ def test_uncraftable_hat(self):
 
         # https://marketplace.tf/items/tf2/734;6;uncraftable
         self.assertEqual("734;6;uncraftable", sku)
+
+    def test_properties(self):
+        sku = "734;6;uncraftable"
+
+        self.assertEqual(734, sku_to_defindex(sku))
+        self.assertEqual(6, sku_to_quality(sku))
+        self.assertEqual(True, sku_is_uncraftable(sku))

tests/test_utils.py

@@ -1,13 +1,26 @@
-from src.tf2_utils import account_id_to_steam_id, to_scrap, to_refined, refinedify
+from src.tf2_utils import (
+    account_id_to_steam_id,
+    steam_id_to_account_id,
+    to_scrap,
+    to_refined,
+    refinedify,
+    get_account_id_from_trade_url,
+    get_steam_id_from_trade_url,
+    get_token_from_trade_url,
+)
 
 from unittest import TestCase
 
+STEAM_ID = "76561198253325712"
+ACCOUNT_ID = "293059984"
+
 
 class TestUtils(TestCase):
     def test_steam_id(self):
-        steam_id = account_id_to_steam_id("293059984")
-
-        self.assertEqual("76561198253325712", steam_id)
+        self.assertEqual(STEAM_ID, account_id_to_steam_id(ACCOUNT_ID))
+        self.assertEqual(ACCOUNT_ID, steam_id_to_account_id(STEAM_ID))
+        self.assertEqual(STEAM_ID, account_id_to_steam_id(int(ACCOUNT_ID)))
+        self.assertEqual(ACCOUNT_ID, steam_id_to_account_id(int(STEAM_ID)))
 
     def test_to_refined(self):
         scrap = 43
@@ -32,3 +45,10 @@ def test_refinedify_down(self):
         refined = refinedify(wrong_value)
 
         self.assertEqual(12.44, refined)
+
+    def test_trade_url(self):
+        trade_url = "https://steamcommunity.com/tradeoffer/new/?partner=293059984&token=0-l_idZR"  # noqa
+
+        self.assertEqual(ACCOUNT_ID, get_account_id_from_trade_url(trade_url))
+        self.assertEqual(STEAM_ID, get_steam_id_from_trade_url(trade_url))
+        self.assertEqual("0-l_idZR", get_token_from_trade_url(trade_url))