busylib 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

busylib/client.py

@@ -29,9 +29,24 @@ class BusyBar:
     Main library class for interacting with the Busy Bar API.
     """
 
-    def __init__(self, addr: str):
-        self.base_url = f"http://{addr}"
+    def __init__(
+        self,
+        addr: str | None = None,
+        *,
+        token: str | None = None,
+    ) -> None:
+        if addr is None and token is None:
+            self.base_url = "http://10.0.4.20"
+        elif addr is None:
+            self.base_url = "https://proxy.dev.busy.app"
+        elif addr is not None:
+            if "://" not in addr:
+                addr = f"http://{addr}"
+            self.base_url = addr
+
         self.client = requests.Session()
+        if token is not None:
+            self.client.headers["Authorization"] = f"Bearer {token}"
 
     def __enter__(self):
         return self
@@ -67,9 +82,7 @@ class BusyBar:
             return response.text
 
     def get_version(self) -> types.VersionInfo:
-        response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/version")
-        )
+        response = self.client.get(urllib.parse.urljoin(self.base_url, "/api/version"))
         data = self._handle_response(response)
         return types.VersionInfo(**data)
 
@@ -81,7 +94,7 @@ class BusyBar:
             params["name"] = name
 
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/update"),
+            urllib.parse.urljoin(self.base_url, "/api/update"),
             params=params,
             data=firmware_data,
             headers={"Content-Type": "application/octet-stream"},
@@ -90,9 +103,7 @@ class BusyBar:
         return types.SuccessResponse(**data)
 
     def get_status(self) -> types.Status:
-        response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/status")
-        )
+        response = self.client.get(urllib.parse.urljoin(self.base_url, "/api/status"))
         data = self._handle_response(response)
 
         system = None
@@ -112,14 +123,14 @@ class BusyBar:
 
     def get_system_status(self) -> types.StatusSystem:
         response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/status/system")
+            urllib.parse.urljoin(self.base_url, "/api/status/system")
         )
         data = self._handle_response(response)
         return types.StatusSystem(**data)
 
     def get_power_status(self) -> types.StatusPower:
         response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/status/power")
+            urllib.parse.urljoin(self.base_url, "/api/status/power")
         )
         data = self._handle_response(response)
 
@@ -130,7 +141,7 @@ class BusyBar:
 
     def write_storage_file(self, path: str, data: bytes) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/storage/write"),
+            urllib.parse.urljoin(self.base_url, "/api/storage/write"),
             params={"path": path},
             data=data,
             headers={"Content-Type": "application/octet-stream"},
@@ -140,14 +151,14 @@ class BusyBar:
 
     def read_storage_file(self, path: str) -> bytes:
         response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/storage/read"),
+            urllib.parse.urljoin(self.base_url, "/api/storage/read"),
             params={"path": path},
         )
         return self._handle_response(response, as_bytes=True)
 
     def list_storage_files(self, path: str) -> types.StorageList:
         response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/storage/list"),
+            urllib.parse.urljoin(self.base_url, "/api/storage/list"),
             params={"path": path},
         )
         data = self._handle_response(response)
@@ -163,7 +174,7 @@ class BusyBar:
 
     def remove_storage_file(self, path: str) -> types.SuccessResponse:
         response = self.client.delete(
-            urllib.parse.urljoin(self.base_url, "/api/v0/storage/remove"),
+            urllib.parse.urljoin(self.base_url, "/api/storage/remove"),
             params={"path": path},
         )
         data = self._handle_response(response)
@@ -171,7 +182,7 @@ class BusyBar:
 
     def create_storage_directory(self, path: str) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/storage/mkdir"),
+            urllib.parse.urljoin(self.base_url, "/api/storage/mkdir"),
             params={"path": path},
         )
         data = self._handle_response(response)
@@ -181,7 +192,7 @@ class BusyBar:
         self, app_id: str, filename: str, data: bytes
     ) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/assets/upload"),
+            urllib.parse.urljoin(self.base_url, "/api/assets/upload"),
             params={"app_id": app_id, "file": filename},
             data=data,
             headers={"Content-Type": "application/octet-stream"},
@@ -191,7 +202,7 @@ class BusyBar:
 
     def delete_app_assets(self, app_id: str) -> types.SuccessResponse:
         response = self.client.delete(
-            urllib.parse.urljoin(self.base_url, "/api/v0/assets/upload"),
+            urllib.parse.urljoin(self.base_url, "/api/assets/upload"),
             params={"app_id": app_id},
         )
         data = self._handle_response(response)
@@ -201,7 +212,7 @@ class BusyBar:
         self, display_data: types.DisplayElements
     ) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/display/draw"),
+            urllib.parse.urljoin(self.base_url, "/api/display/draw"),
             json=_serialize_for_json(display_data),
             headers={"Content-Type": "application/json"},
         )
@@ -210,14 +221,14 @@ class BusyBar:
 
     def clear_display(self) -> types.SuccessResponse:
         response = self.client.delete(
-            urllib.parse.urljoin(self.base_url, "/api/v0/display/draw")
+            urllib.parse.urljoin(self.base_url, "/api/display/draw")
         )
         data = self._handle_response(response)
         return types.SuccessResponse(**data)
 
     def get_display_brightness(self) -> types.DisplayBrightnessInfo:
         response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/display/brightness")
+            urllib.parse.urljoin(self.base_url, "/api/display/brightness")
         )
         data = self._handle_response(response)
         return types.DisplayBrightnessInfo(**data)
@@ -232,7 +243,7 @@ class BusyBar:
             params["back"] = back
 
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/display/brightness"),
+            urllib.parse.urljoin(self.base_url, "/api/display/brightness"),
             params=params,
         )
         data = self._handle_response(response)
@@ -240,7 +251,7 @@ class BusyBar:
 
     def play_audio(self, app_id: str, path: str) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/audio/play"),
+            urllib.parse.urljoin(self.base_url, "/api/audio/play"),
             params={"app_id": app_id, "path": path},
         )
         data = self._handle_response(response)
@@ -248,21 +259,21 @@ class BusyBar:
 
     def stop_audio(self) -> types.SuccessResponse:
         response = self.client.delete(
-            urllib.parse.urljoin(self.base_url, "/api/v0/audio/play")
+            urllib.parse.urljoin(self.base_url, "/api/audio/play")
         )
         data = self._handle_response(response)
         return types.SuccessResponse(**data)
 
     def get_audio_volume(self) -> types.AudioVolumeInfo:
         response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/audio/volume")
+            urllib.parse.urljoin(self.base_url, "/api/audio/volume")
         )
         data = self._handle_response(response)
         return types.AudioVolumeInfo(**data)
 
     def set_audio_volume(self, volume: float) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/audio/volume"),
+            urllib.parse.urljoin(self.base_url, "/api/audio/volume"),
             params={"volume": volume},
         )
         data = self._handle_response(response)
@@ -270,7 +281,7 @@ class BusyBar:
 
     def send_input_key(self, key: types.InputKey) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/input"),
+            urllib.parse.urljoin(self.base_url, "/api/input"),
             params={"key": key.value},
         )
         data = self._handle_response(response)
@@ -278,21 +289,21 @@ class BusyBar:
 
     def enable_wifi(self) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/wifi/enable")
+            urllib.parse.urljoin(self.base_url, "/api/wifi/enable")
         )
         data = self._handle_response(response)
         return types.SuccessResponse(**data)
 
     def disable_wifi(self) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/wifi/disable")
+            urllib.parse.urljoin(self.base_url, "/api/wifi/disable")
         )
         data = self._handle_response(response)
         return types.SuccessResponse(**data)
 
     def get_wifi_status(self) -> types.StatusResponse:
         response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/wifi/status")
+            urllib.parse.urljoin(self.base_url, "/api/wifi/status")
         )
         data = self._handle_response(response)
 
@@ -316,7 +327,7 @@ class BusyBar:
 
     def connect_wifi(self, config: types.ConnectRequestConfig) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/wifi/connect"),
+            urllib.parse.urljoin(self.base_url, "/api/wifi/connect"),
             json=_serialize_for_json(config),
             headers={"Content-Type": "application/json"},
         )
@@ -325,14 +336,14 @@ class BusyBar:
 
     def disconnect_wifi(self) -> types.SuccessResponse:
         response = self.client.post(
-            urllib.parse.urljoin(self.base_url, "/api/v0/wifi/disconnect")
+            urllib.parse.urljoin(self.base_url, "/api/wifi/disconnect")
         )
         data = self._handle_response(response)
         return types.SuccessResponse(**data)
 
     def scan_wifi_networks(self) -> types.NetworkResponse:
         response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/wifi/networks")
+            urllib.parse.urljoin(self.base_url, "/api/wifi/networks")
         )
         data = self._handle_response(response)
 
@@ -353,7 +364,7 @@ class BusyBar:
 
     def get_screen_frame(self, display: int) -> bytes:
         response = self.client.get(
-            urllib.parse.urljoin(self.base_url, "/api/v0/screen"),
+            urllib.parse.urljoin(self.base_url, "/api/screen"),
             params={"display": display},
         )
         return self._handle_response(response, as_bytes=True)

busylib/types.py

@@ -80,10 +80,7 @@ class Error:
 
 @dataclasses.dataclass(frozen=True)
 class VersionInfo:
-    branch: str
-    version: str
-    build_date: str
-    commit_hash: str
+    api_semver: str
 
 
 @dataclasses.dataclass(frozen=True)

{busylib-0.1.0.dist-info → busylib-0.2.0.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: busylib
-Version: 0.1.0
+Version: 0.2.0
 Summary: Python library for Busy Bar API
-Author-email: Valerii Lisai <v.lisai@flipperdevices.com>
-Project-URL: Homepage, https://github.com/busy-app/busylib
-Project-URL: Repository, https://github.com/busy-app/busylib
+Author-email: flipperdevices <pypi@flipperdevices.com>
+Project-URL: Homepage, https://github.com/busy-app/busylib-py
+Project-URL: Repository, https://github.com/busy-app/busylib-py
 Project-URL: Documentation, https://busylib.readthedocs.io
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers

busylib-0.2.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+busylib/__init__.py,sha256=7CQFe1iS-QRVAVlufLarG0MXEjkbqZht_DI2kUvsHz0,28
+busylib/client.py,sha256=3mm5Xqr0N_KvbdxHdOkV4PWTqcxMHq4hDZziz0ykYKU,13079
+busylib/exceptions.py,sha256=DHYoEXGdADXSxcgLq7BWqq_865J0LsMysZL-Wuip2wc,210
+busylib/types.py,sha256=P6WC7qzV2wJH6VHSKozdv6ujCTA-qrl5i25LVIewkic,4169
+busylib-0.2.0.dist-info/licenses/LICENSE,sha256=aJO9BQGuVb1fvGzHcgWYiwcC9kEFyD-FBb8SPO-ATJ4,1071
+busylib-0.2.0.dist-info/METADATA,sha256=VKuyfOWBb_C-mgQoC2jMXLX0X1Sw7oDjjXX6TiEXtRw,5518
+busylib-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+busylib-0.2.0.dist-info/top_level.txt,sha256=tXeqg2EVVj4E8-ywimkxRzuCJq2HqMXA0571IB15PDA,8
+busylib-0.2.0.dist-info/RECORD,,

busylib-0.1.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-busylib/__init__.py,sha256=7CQFe1iS-QRVAVlufLarG0MXEjkbqZht_DI2kUvsHz0,28
-busylib/client.py,sha256=l-gMVPP5X9m0IGqnjMjKPUo-olw4nf2cHvgz7DtdIjw,12746
-busylib/exceptions.py,sha256=DHYoEXGdADXSxcgLq7BWqq_865J0LsMysZL-Wuip2wc,210
-busylib/types.py,sha256=AGNd39jN5Rn5fI9kk5Ugk-4fr3JeXQpka2YEFeEWKNw,4223
-busylib-0.1.0.dist-info/licenses/LICENSE,sha256=aJO9BQGuVb1fvGzHcgWYiwcC9kEFyD-FBb8SPO-ATJ4,1071
-busylib-0.1.0.dist-info/METADATA,sha256=v8QccaMsA439sMQYg5hrQ9dAcDmIZKXuPHts6UnDIcc,5514
-busylib-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-busylib-0.1.0.dist-info/top_level.txt,sha256=tXeqg2EVVj4E8-ywimkxRzuCJq2HqMXA0571IB15PDA,8
-busylib-0.1.0.dist-info/RECORD,,