chore(playout): update api-client imports

playout/libretime_playout/player/fetch.py

@@ -12,8 +12,8 @@ from queue import Empty
 from subprocess import PIPE, Popen
 from threading import Thread, Timer
 
-from libretime_api_client import version1 as v1_api_client
-from libretime_api_client import version2 as api_client
+from libretime_api_client.v1 import AirtimeApiClient as ApiClientV1
+from libretime_api_client.v2 import AirtimeApiClient as ApiClientV2
 from loguru import logger
 
 from ..config import CACHE_DIR, POLL_INTERVAL, Config
@@ -44,8 +44,8 @@ class PypoFetch(Thread):
         # Hacky...
         PypoFetch.ref = self
 
-        self.v1_api_client = v1_api_client.AirtimeApiClient()
-        self.api_client = api_client.AirtimeApiClient()
+        self.v1_api_client = ApiClientV1()
+        self.api_client = ApiClientV2()
         self.fetch_queue = pypoFetch_q
         self.push_queue = pypoPush_q
         self.media_prepare_queue = media_q

playout/libretime_playout/player/file.py

@@ -6,7 +6,7 @@ import traceback
 from queue import Empty
 from threading import Thread
 
-from libretime_api_client import version2 as api_client
+from libretime_api_client.v2 import AirtimeApiClient as ApiClient
 from loguru import logger
 from requests.exceptions import ConnectionError, Timeout
 
@@ -16,7 +16,7 @@ class PypoFile(Thread):
         Thread.__init__(self)
         self.media_queue = schedule_queue
         self.media = None
-        self.api_client = api_client.AirtimeApiClient()
+        self.api_client = ApiClient()
 
     def copy_file(self, media_item):
         """

playout/libretime_playout/player/push.py

@@ -6,7 +6,7 @@ from datetime import datetime
 from queue import Queue
 from threading import Thread
 
-from libretime_api_client import version1 as api_client
+from libretime_api_client.v1 import AirtimeApiClient as ApiClient
 from loguru import logger
 
 from ..config import PUSH_INTERVAL, Config
@@ -25,7 +25,7 @@ def is_file(media_item):
 class PypoPush(Thread):
     def __init__(self, q, telnet_lock, pypo_liquidsoap, config: Config):
         Thread.__init__(self)
-        self.api_client = api_client.AirtimeApiClient()
+        self.api_client = ApiClient()
         self.queue = q
 
         self.telnet_lock = telnet_lock

playout/libretime_playout/player/schedule.py

@@ -2,7 +2,7 @@ from datetime import datetime, timedelta
 from typing import Dict
 
 from dateutil.parser import isoparse
-from libretime_api_client.version2 import AirtimeApiClient as ApiClient
+from libretime_api_client.v2 import AirtimeApiClient as ApiClient
 from libretime_shared.datetime import (
     time_fromisoformat,
     time_in_milliseconds,