xair-api 2.3.2__py3-none-any.whl → 2.4.1__py3-none-any.whl

xair_api/strip.py

@@ -16,10 +16,10 @@ class IStrip(abc.ABC):
         self.logger = logger.getChild(self.__class__.__name__)
 
     def getter(self, param: str) -> tuple:
-        return self._remote.query(f"{self.address}/{param}")
+        return self._remote.query(f'{self.address}/{param}')
 
     def setter(self, param: str, val: int):
-        self._remote.send(f"{self.address}/{param}", val)
+        self._remote.send(f'{self.address}/{param}', val)
 
     @abc.abstractmethod
     def address(self):
@@ -40,12 +40,12 @@ class Strip(IStrip):
         """
 
         STRIP_cls = type(
-            f"Strip{remote.kind}",
+            f'Strip{remote.kind}',
             (cls,),
             {
                 **{
                     _cls.__name__.lower(): type(
-                        f"{_cls.__name__}{remote.kind}", (_cls, cls), {}
+                        f'{_cls.__name__}{remote.kind}', (_cls, cls), {}
                     )(remote, index)
                     for _cls in (
                         Config,
@@ -59,15 +59,15 @@ class Strip(IStrip):
                         Automix,
                     )
                 },
-                "send": tuple(
+                'send': tuple(
                     Send.make(cls, i, remote, index)
                     for i in range(remote.kind.num_bus + remote.kind.num_fx)
                 ),
-                "mute": mute_prop(),
+                'mute': mute_prop(),
             },
         )
         return STRIP_cls(remote, index)
 
     @property
     def address(self) -> str:
-        return f"/ch/{str(self.index).zfill(2)}"
+        return f'/ch/{str(self.index).zfill(2)}'

xair_api/util.py

@@ -19,7 +19,7 @@ def timeout(func):
         while time.time() < start + remote.connect_timeout:
             try:
                 func(*args, **kwargs)
-                remote.logger.debug(f"login time: {round(time.time() - start, 2)}")
+                remote.logger.debug(f'login time: {round(time.time() - start, 2)}')
                 err = None
                 break
             except XAirRemoteConnectionTimeoutError as e:

xair_api/xair.py

@@ -20,6 +20,7 @@ from .config import Config
 from .dca import DCA
 from .errors import XAirRemoteConnectionTimeoutError, XAirRemoteError
 from .fx import FX, FXSend
+from .headamp import HeadAmp
 from .kinds import KindMap
 from .lr import LR
 from .rtn import AuxRtn, FxRtn
@@ -30,7 +31,7 @@ logger = logging.getLogger(__name__)
 
 class OSCClientServer(BlockingOSCUDPServer):
     def __init__(self, address: str, dispatcher: Dispatcher):
-        super().__init__(("", 0), dispatcher)
+        super().__init__(('', 0), dispatcher)
         self.xr_address = address
 
     def send_message(self, address: str, vals: Optional[Union[str, list]]):
@@ -52,13 +53,13 @@ class XAirRemote(abc.ABC):
     def __init__(self, **kwargs):
         dispatcher = Dispatcher()
         dispatcher.set_default_handler(self.msg_handler)
-        self.xair_ip = kwargs["ip"] or self._ip_from_toml()
-        self.xair_port = kwargs["port"]
-        self._delay = kwargs["delay"]
-        self.connect_timeout = kwargs["connect_timeout"]
+        self.xair_ip = kwargs['ip'] or self._ip_from_toml()
+        self.xair_port = kwargs['port']
+        self._delay = kwargs['delay']
+        self.connect_timeout = kwargs['connect_timeout']
         self.logger = logger.getChild(self.__class__.__name__)
         if not self.xair_ip:
-            raise XAirRemoteError("No valid ip detected")
+            raise XAirRemoteError('No valid ip detected')
         self.server = OSCClientServer((self.xair_ip, self.xair_port), dispatcher)
 
     def __enter__(self):
@@ -68,17 +69,17 @@ class XAirRemote(abc.ABC):
         return self
 
     def _ip_from_toml(self) -> str:
-        filepath = Path.cwd() / "config.toml"
-        with open(filepath, "rb") as f:
+        filepath = Path.cwd() / 'config.toml'
+        with open(filepath, 'rb') as f:
             conn = tomllib.load(f)
-        return conn["connection"].get("ip")
+        return conn['connection'].get('ip')
 
     @util.timeout
     def validate_connection(self):
-        if not self.query("/xinfo"):
+        if not self.query('/xinfo'):
             raise XAirRemoteConnectionTimeoutError(self.xair_ip, self.xair_port)
         self.logger.info(
-            f"Successfully connected to {self.info_response[2]} at {self.info_response[0]}."
+            f'Successfully connected to {self.info_response[2]} at {self.info_response[0]}.'
         )
 
     @property
@@ -114,10 +115,10 @@ def _make_remote(kind: KindMap) -> XAirRemote:
 
     def init_x32(self, *args, **kwargs):
         defaultkwargs = {
-            "ip": None,
-            "port": 10023,
-            "delay": 0.02,
-            "connect_timeout": 2,
+            'ip': None,
+            'port': 10023,
+            'delay': 0.02,
+            'connect_timeout': 2,
         }
         kwargs = defaultkwargs | kwargs
         XAirRemote.__init__(self, *args, **kwargs)
@@ -134,13 +135,14 @@ def _make_remote(kind: KindMap) -> XAirRemote:
         self.fxreturn = tuple(adapter.FxRtn.make(self, i) for i in range(kind.num_fx))
         self.auxin = tuple(adapter.AuxRtn.make(self, i) for i in range(kind.num_auxrtn))
         self.config = Config.make(self)
+        self.headamp = tuple(adapter.HeadAmp(self, i) for i in range(kind.num_headamp))
 
     def init_xair(self, *args, **kwargs):
         defaultkwargs = {
-            "ip": None,
-            "port": 10024,
-            "delay": 0.02,
-            "connect_timeout": 2,
+            'ip': None,
+            'port': 10024,
+            'delay': 0.02,
+            'connect_timeout': 2,
         }
         kwargs = defaultkwargs | kwargs
         XAirRemote.__init__(self, *args, **kwargs)
@@ -154,20 +156,21 @@ def _make_remote(kind: KindMap) -> XAirRemote:
         self.fxreturn = tuple(FxRtn.make(self, i) for i in range(kind.num_fx))
         self.auxreturn = AuxRtn.make(self)
         self.config = Config.make(self)
+        self.headamp = tuple(HeadAmp(self, i) for i in range(kind.num_strip))
 
-    if kind.id_ == "X32":
+    if kind.id_ == 'X32':
         return type(
-            f"XAirRemote{kind}",
+            f'XAirRemote{kind}',
             (XAirRemote,),
             {
-                "__init__": init_x32,
+                '__init__': init_x32,
             },
         )
     return type(
-        f"XAirRemote{kind}",
+        f'XAirRemote{kind}',
         (XAirRemote,),
         {
-            "__init__": init_xair,
+            '__init__': init_xair,
         },
     )
 

{xair_api-2.3.2.dist-info → xair_api-2.4.1.dist-info}/METADATA

@@ -1,25 +1,24 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: xair-api
-Version: 2.3.2
+Version: 2.4.1
 Summary: Remote control Behringer X-Air | Midas MR mixers through OSC
-Home-page: https://github.com/onyx-and-iris/xair-api-python
 License: MIT
-Author: onyx-and-iris
+Author: Onyx and Iris
 Author-email: code@onyxandiris.online
-Requires-Python: >=3.10,<4.0
+Requires-Python: <4.0,>=3.10
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: python-osc (>=1.8.0,<2.0.0)
-Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"
-Project-URL: Repository, https://github.com/onyx-and-iris/xair-api-python
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: python-osc (>=1.9.3,<2.0.0)
+Requires-Dist: tomli (>=2.0.1,<3.0) ; python_version < "3.11"
 Description-Content-Type: text/markdown
 
 [![PyPI version](https://badge.fury.io/py/xair-api.svg)](https://badge.fury.io/py/xair-api)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/onyx-and-iris/xair-api-python/blob/dev/LICENSE)
-[![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/)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 ![Tests Status](./tests/xair/MR18.svg?dummy=8484744)
 
 # Xair API
@@ -58,18 +57,18 @@ import xair_api
 
 
 def main():
-    kind_id = "XR18"
-    ip = "<ip address>"
+    kind_id = 'XR18'
+    ip = '<ip address>'
 
     with xair_api.connect(kind_id, ip=ip) as mixer:
-        mixer.strip[8].config.name = "sm7b"
+        mixer.strip[8].config.name = 'sm7b'
         mixer.strip[8].mix.on = True
         print(
-            f"strip 09 ({mixer.strip[8].config.name}) on has been set to {mixer.strip[8].mix.on}"
+            f'strip 09 ({mixer.strip[8].config.name}) on has been set to {mixer.strip[8].mix.on}'
         )
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()
 ```
 
@@ -132,6 +131,10 @@ A class representing auxreturn channel
 
 A class representing the main config settings
 
+`mixer.headamp`
+
+A class representing the channel preamps (phantom power/gain).
+
 ### `LR`
 
 Contains the subclasses:
@@ -162,6 +165,13 @@ Contains the subclasses:
 Contains the subclasses:
 (`Config`, `Preamp`, `EQ`, `Mix`, `Group`, `Send`)
 
+### `HeadAmp`
+
+The following properties are available:
+
+- `gain`: float, from -12.0 to 60.0
+- `phantom`: bool
+
 ### `Subclasses`
 
 For each subclass the corresponding properties are available.
@@ -322,8 +332,8 @@ Send an OSC command directly to the mixer
 for example:
 
 ```python
-mixer.send("/ch/01/mix/on", 1)
-mixer.send("/bus/2/config/name", "somename")
+mixer.send('/ch/01/mix/on', 1)
+mixer.send('/bus/2/config/name', 'somename')
 ```
 
 Query the value of a command:
@@ -333,7 +343,7 @@ Query the value of a command:
 for example:
 
 ```python
-print(mixer.query("/ch/01/mix/on"))
+print(mixer.query('/ch/01/mix/on'))
 ```
 
 ### Errors

xair_api-2.4.1.dist-info/RECORD

@@ -0,0 +1,20 @@
+xair_api/__init__.py,sha256=O6VVgrgm1hq2iwgl6XNAWu54uxlpr7aB28s_a6fCm10,73
+xair_api/adapter.py,sha256=wD2oIFoHG-smgCC9z6fC_Ly0yIwjvZW5HPdjCT9KfLs,963
+xair_api/bus.py,sha256=a44uaQ-OVxekKottir86aNzuP1Srw2s97Afshqq5m5o,1771
+xair_api/config.py,sha256=vZ7R3eNu-it39icn1AlixAAFlp08ay3PXuNVQ725lzg,5853
+xair_api/dca.py,sha256=sn_X9dK4i-DEPr8E8Ot9seYrIiL1bJiKSjiPmZ4FjBo,1443
+xair_api/errors.py,sha256=Bm0ezXP8pgeiiz76UbVkaVpvJLw03qq71LOpCclaDEY,411
+xair_api/fx.py,sha256=PxAX_XZE67XtnsPyp3xLH79-DeG6dVJZpjECDSB2Ltg,1811
+xair_api/headamp.py,sha256=L6N5FrifYChUckuvOfp8fOrwczW9i1V51mXFowKaONk,1175
+xair_api/kinds.py,sha256=WS3pZBgpGAG-HPIPkgOxnGqqTnqQAjOEAO6f5SD7FUY,1155
+xair_api/lr.py,sha256=xqlsr2D_jvzDWsHDzbOf1EKW699UHd19vGmCFG6UQkk,1788
+xair_api/meta.py,sha256=rU61YNScmiPcvlNU7WcAhRP9AQXS0XoOkZ9ntm1iW6k,1564
+xair_api/rtn.py,sha256=f35eMrGw4YBfv1JK6vsKbaVXJfACotz8EycMxBiz2y4,3177
+xair_api/shared.py,sha256=k1RuE2N_RR9nKQQa6AyeIqtZ4i6IfrKzSl4YM7eAC_4,19171
+xair_api/strip.py,sha256=_ge_GfBeYiEBbRzMWBh67kaoZ907iwvnd6Bte_n_x9Y,2082
+xair_api/util.py,sha256=OxgWTWRqZLUz4AGTRT-hETjM4EUO4e8tXppRSOFY01M,2263
+xair_api/xair.py,sha256=Qhy7Ey6Gk092ADZNfn9sQ2sClRJHBZtehDBUNrUkRXQ,6582
+xair_api-2.4.1.dist-info/LICENSE,sha256=m2fbtv9II-iQqimTd4zjgynL5vuEqGXauLSDJZycYIo,1124
+xair_api-2.4.1.dist-info/METADATA,sha256=kc-8xB3c0997vgOl2YCEs33-je04tOmksS6uP6Uvx9s,8932
+xair_api-2.4.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+xair_api-2.4.1.dist-info/RECORD,,

{xair_api-2.3.2.dist-info → xair_api-2.4.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any

xair_api-2.3.2.dist-info/RECORD

@@ -1,20 +0,0 @@
-xair_api/__init__.py,sha256=na_Zd_yo8E1LCoeWrAPJR68Ygdm5R8RRrlqb-UnWMtA,73
-xair_api/adapter.py,sha256=icQXeqrYu6iWOJbke6zXdOzxyhAV__dXKrCnuDbZAUU,797
-xair_api/bus.py,sha256=digswx5ApbLCpF6R7_8OqfvnJ8C9JIFpe8MFxKXbSB0,1771
-xair_api/config.py,sha256=ditmhP770trYIu7eouw4pU3BgOtXwOB8dearYJbhSuw,5853
-xair_api/dca.py,sha256=C-wyBqeAi0qr1qrOKefyIWsJwI8ebs2iV83Q2iC67-k,1443
-xair_api/errors.py,sha256=rfFmAW6QitHe0iB56M48He-qsbvDaKe1_AN_j4-9oUA,411
-xair_api/fx.py,sha256=AzjgpJSHDCWwWRGCWxeGwwsm8jcxl3fJykprk9cwSUM,1811
-xair_api/kinds.py,sha256=ulJJhLpiUuOw5Ir7Q3CQbmAKrd33xq8CIHpAFc5zEdw,1119
-xair_api/lr.py,sha256=WL5YnDeLeJPxIK5OdTqZQ3s6UEfQ3-onz99OEdi0-mE,1788
-xair_api/meta.py,sha256=iUWPSP4QcWMW6gyLc5SGDJ49pKZgJrHzFphtL6OFptE,1564
-xair_api/rtn.py,sha256=lOTGSkxsYpc4usIba-reZSRmfa-7JIr_FTThSw6BdLY,3177
-xair_api/shared.py,sha256=ABVTgx9sIH9zZLJLKeZBrhdMXj-WGNuggxrqjn8oa3M,19171
-xair_api/strip.py,sha256=pAFX0Ssq1kC9BghGJhd6ShJ0on16DbkWoickH0jA-Jg,2082
-xair_api/util.py,sha256=Rd2eGhqIjFe29s-0ffQGzs9p5lXsfCRJ91i6BPEVzxE,2263
-xair_api/xair.py,sha256=60ZAZVj0dWmVfcedFtB_rEbv6fnyb-7nP-Z1ltAeqUs,6384
-xair_api-2.3.2.dist-info/entry_points.txt,sha256=hlKDU0C0XSGDitHXAvt6YQfmI99p3eJBaoQqEQhpH2U,126
-xair_api-2.3.2.dist-info/LICENSE,sha256=m2fbtv9II-iQqimTd4zjgynL5vuEqGXauLSDJZycYIo,1124
-xair_api-2.3.2.dist-info/METADATA,sha256=OhG5fjrYkW_wVbEFE6yIbaup5Owe0rz2e1scbLIX2rg,8868
-xair_api-2.3.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-xair_api-2.3.2.dist-info/RECORD,,

xair_api-2.3.2.dist-info/entry_points.txt

@@ -1,7 +0,0 @@
-[console_scripts]
-all=scripts:test_all
-obs=scripts:ex_obs
-sends=scripts:ex_sends
-x32=scripts:test_x32
-xair=scripts:test_xair
-