.gitignore

@@ -51,7 +51,7 @@ venv.bak/
 .python-version
 
 # Test/config
-test-*.py
+quick.py
 config.toml
 obsws.log
 

.pre-commit-config.yaml

@@ -1,10 +0,0 @@
-repos:
-  - repo: local
-    hooks:
-      - id: format
-        name: format
-        entry: hatch run style:fmt
-        language: system
-        pass_filenames: false
-        verbose: true
-        files: \.(py)$

README.md

@@ -1,6 +1,5 @@
 [![PyPI version](https://badge.fury.io/py/obsws-python.svg)](https://badge.fury.io/py/obsws-python)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://github.com/aatikturk/obsstudio_sdk/blob/main/LICENSE)
-[![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
 
@@ -93,7 +92,7 @@ resp = cl_req.send("GetVersion", raw=True)
 print(f"response data: {resp}")
 ```
 
-For a full list of requests refer to [Requests][obsws-reqs]
+For a full list of requests refer to [Requests](https://github.com/obsproject/obs-websocket/blob/master/docs/generated/protocol.md#requests)
 
 ### Events
 
@@ -126,7 +125,7 @@ cl.callback.deregister(on_input_mute_state_changed)
 
 `register(fns)` and `deregister(fns)` accept both single functions and lists of functions.
 
-For a full list of events refer to [Events][obsws-events]
+For a full list of events refer to [Events](https://github.com/obsproject/obs-websocket/blob/master/docs/generated/protocol.md#events)
 
 ### Attributes
 
@@ -150,7 +149,7 @@ def on_scene_created(data):
   - The following attributes are available:
     - `req_name`: name of the request.
     - `code`: request status code.
-  - For a full list of status codes refer to [Codes][obsws-codes]
+  - For a full list of status codes refer to [Codes](https://github.com/obsproject/obs-websocket/blob/master/docs/generated/protocol.md#requeststatus)
 
 ### Logging
 
@@ -169,19 +168,18 @@ logging.basicConfig(level=logging.DEBUG)
 
 ### Tests
 
-Install [hatch][hatch-install] and then:
+First install development dependencies:
 
-`hatch test`
+`pip install -e .['dev']`
+
+To run all tests:
+
+```
+pytest -v
+```
 
 ### Official Documentation
 
 For the full documentation:
 
-- [OBS Websocket SDK][obsws-pro]
+- [OBS Websocket SDK](https://github.com/obsproject/obs-websocket/blob/master/docs/generated/protocol.md#obs-websocket-501-protocol)
-
-
-[obsws-reqs]: https://github.com/obsproject/obs-websocket/blob/master/docs/generated/protocol.md#requests
-[obsws-events]: https://github.com/obsproject/obs-websocket/blob/master/docs/generated/protocol.md#events
-[obsws-codes]: https://github.com/obsproject/obs-websocket/blob/master/docs/generated/protocol.md#requeststatus
-[obsws-pro]: https://github.com/obsproject/obs-websocket/blob/master/docs/generated/protocol.md#obs-websocket-501-protocol
-[hatch-install]: https://hatch.pypa.io/latest/install/

obsws_python/baseclient.py

@@ -96,8 +96,10 @@ class ObsClient:
 
             auth = base64.b64encode(
                 hashlib.sha256(
-                    secret
+                    (
-                    + self.server_hello["d"]["authentication"]["challenge"].encode()
+                        secret
+                        + self.server_hello["d"]["authentication"]["challenge"].encode()
+                    )
                 ).digest()
             ).decode()
 

obsws_python/callback.py

@@ -1,5 +1,4 @@
-from collections.abc import Callable, Iterable
+from typing import Callable, Iterable, Union
-from typing import Union
 
 from .util import as_dataclass, to_camel_case, to_snake_case
 

obsws_python/reqs.py

@@ -42,7 +42,7 @@ class ReqClient:
 
     def __str__(self):
         return type(self).__name__
-
+    
     def disconnect(self):
         self.base_client.ws.close()
 
@@ -438,7 +438,7 @@ class ReqClient:
 
     def set_record_directory(self, recordDirectory):
         """
-        Sets the current directory that the record output writes files to.
+        Sets the current directory that the record output writes files to. 
         IMPORTANT NOTE: Requires obs websocket v5.3 or higher.
 
         :param recordDirectory: Output directory
@@ -448,7 +448,7 @@ class ReqClient:
             "recordDirectory": recordDirectory,
         }
         return self.send("SetRecordDirectory", payload)
-
+    
     def get_source_active(self, name):
         """
         Gets the active and show state of a source

pyproject.toml

@@ -17,6 +17,14 @@ dependencies = [
     "websocket-client",
 ]
 
+[project.optional-dependencies]
+dev = [
+    "black",
+    "isort",
+    "pytest",
+    "pytest-randomly",
+]
+
 [project.urls]
 Homepage = "https://github.com/aatikturk/obsws-python"
 
@@ -28,58 +36,19 @@ include = [
     "/obsws_python",
 ]
 
-[tool.hatch.envs.default]
-dependencies = ["pre-commit"]
-
-[tool.hatch.envs.e]
-dependencies = ["keyboard"]
-
 [tool.hatch.envs.e.scripts]
 events = "python {root}\\examples\\events\\."
 hotkeys = "python {root}\\examples\\hotkeys\\."
 levels = "python {root}\\examples\\levels\\."
 scene_rotate = "python {root}\\examples\\scene_rotate\\."
 
-[tool.hatch.envs.hatch-test]
+[tool.hatch.envs.test]
-randomize = true
-
-[tool.hatch.envs.hatch-test.scripts]
-run = "pytest{env:HATCH_TEST_ARGS:} {args}"
-
-[[tool.hatch.envs.hatch-test.matrix]]
-python = ["313", "312", "311", "310", "39"]
-
-[tool.hatch.envs.style]
-detached = true
 dependencies = [
-    "black",
+  "pytest",
-    "isort",
 ]
 
-[tool.hatch.envs.style.scripts]
+[tool.hatch.envs.test.scripts]
-check = [
+run = 'pytest -v'
-    "black --check --diff .",
-    "isort --check-only --diff .",
-]
-fmt = [
-    "isort .",
-    "black .",
-]
 
-[tool.black]
+[[tool.hatch.envs.test.matrix]]
-line-length = 88
+python = ["39", "310", "311", "312"]
-include = '\.pyi?$'
-# 'extend-exclude' excludes files or directories in addition to the defaults
-extend-exclude = '''
-(
-    ^/\.git/  # exclude all files in the .git directory
-    ^/\.hatch/  # exclude all files in the .hatch directory
-    ^/\.pytest_cache/  # exclude all files in the .pytest_cache directory
-    | .*_pb2.py  # exclude autogenerated Protocol Buffer files anywhere in the project
-)
-'''
-
-[tool.isort]
-profile = "black"
-skip = [".gitignore", ".dockerignore"]
-skip_glob = [".git/*", ".hatch/*", ".pytest_cache/*"]

tests/test_attrs.py

@@ -18,12 +18,7 @@ class TestAttrs:
 
     def test_get_current_program_scene_attrs(self):
         resp = req_cl.get_current_program_scene()
-        assert resp.attrs() == [
+        assert resp.attrs() == ["current_program_scene_name"]
-            "current_program_scene_name",
-            "current_program_scene_uuid",
-            "scene_name",
-            "scene_uuid",
-        ]
 
     def test_get_transition_kind_list_attrs(self):
         resp = req_cl.get_transition_kind_list()

tests/test_callback.py

@@ -1,5 +1,4 @@
 import pytest
-
 from obsws_python.callback import Callback
 
 

tests/test_request.py

@@ -55,7 +55,6 @@ class TestRequests:
         resp = req_cl.get_persistent_data("OBS_WEBSOCKET_DATA_REALM_PROFILE", name)
         assert resp.slot_value == data
 
-    @pytest.mark.skip(reason="possible bug in obs-websocket, needs checking")
     def test_profile_list(self):
         req_cl.create_profile("test")
         resp = req_cl.get_profile_list()
@@ -98,15 +97,11 @@ class TestRequests:
             "START_TEST", "test", "color_source_v3", {"color": 4294945535}, True
         )
         resp = req_cl.get_input_list()
-        for input_item in resp.inputs:
+        assert {
-            if input_item["inputName"] == "test":
+            "inputKind": "color_source_v3",
-                assert input_item["inputKind"] == "color_source_v3"
+            "inputName": "test",
-                assert input_item["unversionedInputKind"] == "color_source"
+            "unversionedInputKind": "color_source",
-                break
+        } in resp.inputs
-        else:
-            # This else block is executed if the for loop completes without finding the input_item with inputName "test"
-            raise AssertionError("Input with inputName 'test' not found")
-
         resp = req_cl.get_input_settings("test")
         assert resp.input_kind == "color_source_v3"
         assert resp.input_settings == {"color": 4294945535}