plexflow 0.0.71__tar.gz → 0.0.73__tar.gz

{plexflow-0.0.71 → plexflow-0.0.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: plexflow
-Version: 0.0.71
+Version: 0.0.73
 Summary: A short description of the package.
 License: MIT
 Keywords: keyword1,keyword2,keyword3

{plexflow-0.0.71 → plexflow-0.0.73}/plexflow/core/subtitles/providers/auto_subtitles.py

@@ -8,6 +8,7 @@ from plexflow.utils.retry.utils import execute_until_success
 import time
 from pathlib import Path
 from plexflow.logging.log_setup import logger
+import redis
 
 class AutoSubtitles:
     """
@@ -22,20 +23,20 @@ class AutoSubtitles:
     def __init__(self, imdb_id: str, languages: List[str] = (), **kwargs: Any) -> None:
         self.imdb_id = imdb_id
         self.languages = languages
-        self.redis_hook = kwargs.pop("redis_hook", UniversalRedisHook(redis_conn_id='redis', config_folder='config'))
+        self.redis = kwargs.pop("redis", redis.Redis())
         self.download = kwargs.pop("download", False)
         self.download_folder = Path(kwargs.pop("download_folder", Path(".")))
         self.kwargs = kwargs
     
     def __iter__(self) -> Iterator[OSSSubtitle]:
-        subtitles = get_subtitles(self.imdb_id, self.languages, self.redis_hook, ignore_blacklist=True, **self.kwargs)
+        subtitles = get_subtitles(self.imdb_id, self.languages, self.redis, ignore_blacklist=True, **self.kwargs)
         if len(subtitles) == 0:
             logger.warning(f"No subtitles found for IMDb ID: {self.imdb_id}")
             return
         
         for subtitle in tqdm(subtitles, total=len(subtitles)):
             if self.download:
-                subtitle_path, skipped = execute_until_success(download_subtitle, delay_type='constant', delay=3, max_retries=10, subtitle=subtitle, redis_hook=self.redis_hook, retry_exceptions=[OpenSubtitlesDownloadQuotaReachedException], save_dir=self.download_folder)
+                subtitle_path, skipped = execute_until_success(download_subtitle, delay_type='constant', delay=3, max_retries=10, subtitle=subtitle, r=self.redis, retry_exceptions=[OpenSubtitlesDownloadQuotaReachedException], save_dir=self.download_folder)
                 if not skipped:
                     logger.debug(f"Subtitle downloaded: {subtitle_path}")
                     # time.sleep(1.2)

{plexflow-0.0.71 → plexflow-0.0.73}/plexflow/core/subtitles/providers/oss/download.py

@@ -6,8 +6,10 @@ from plexflow.utils.retry.utils import execute_until_success
 from plexflow.utils.hooks.redis import UniversalRedisHook
 from pathlib import Path
 from plexflow.logging.log_setup import logger
+import redis
+import os
 
-def download_subtitle(subtitle: OSSSubtitle, redis_hook: UniversalRedisHook = None, save_dir: Path = Path('.'), skip_exists: bool = True) -> None:
+def download_subtitle(subtitle: OSSSubtitle, r: redis.Redis = None, save_dir: Path = Path('.'), skip_exists: bool = True) -> None:
     """
     Downloads and saves the subtitle file using the OpenSubtitlesManager.
 
@@ -26,8 +28,8 @@ def download_subtitle(subtitle: OSSSubtitle, redis_hook: UniversalRedisHook = No
         return None, True
     else:
         with OpenSubtitlesManager.from_yaml(
-            yaml_file='config/credentials.yaml',
-            redis_hook=redis_hook, 
+            yaml_file=os.getenv("OSS_CREDENTIALS_PATH"),
+            r=r,
         ) as manager:
             filepath.parent.mkdir(parents=True, exist_ok=True)
             metapath.write_text(subtitle.subtitle.to_json())
@@ -43,6 +45,6 @@ def download_subtitles(subtitles: List[OSSSubtitle], **kwargs) -> None:
     Returns:
         None
     """
-    redis_hook = kwargs.pop("redis_hook", UniversalRedisHook(redis_conn_id='redis', config_folder='config'))
+    r = kwargs.pop("redis", redis.Redis())
     for subtitle in subtitles:
-        execute_until_success(download_subtitle, delay_type='constant', delay=3, max_retries=10, subtitle=subtitle, redis_hook=redis_hook, retry_exceptions=[OpenSubtitlesDownloadQuotaReachedException])
+        execute_until_success(download_subtitle, delay_type='constant', delay=3, max_retries=10, subtitle=subtitle, r=r, retry_exceptions=[OpenSubtitlesDownloadQuotaReachedException])

{plexflow-0.0.71 → plexflow-0.0.73}/plexflow/core/subtitles/providers/oss/oss.py

@@ -22,11 +22,12 @@ from plexflow.core.subtitles.providers.oss.utils.download_client import Download
 from plexflow.core.subtitles.providers.oss.utils.languages import language_codes
 from plexflow.utils.hooks.redis import UniversalRedisHook
 from plexflow.logging.log_setup import logger
+import redis
 
 class OpenSubtitles:
     """OpenSubtitles REST API Wrapper."""
 
-    def __init__(self, user_agent: str, api_key: str, redis_hook: UniversalRedisHook = None):
+    def __init__(self, user_agent: str, api_key: str, r: redis.Redis = None):
         """Initialize the OpenSubtitles object.
 
         :param api_key:
@@ -41,13 +42,13 @@ class OpenSubtitles:
         self.downloads_dir = "."
         self.user_downloads_remaining = 0
         self.reset_time = None
-        self.redis_hook = redis_hook
+        self.redis = r
         
     @property
     def cached_token(self):
         try:
-            if self.redis_hook:
-                return self.redis_hook.get(f"@opensubtitles/{self.api_key}/token").decode("utf-8")
+            if self.redis:
+                return self.redis.get(f"@opensubtitles/{self.api_key}/token").decode("utf-8")
             else:
                 return None
         except Exception as e:
@@ -59,7 +60,7 @@ class OpenSubtitles:
     def cached_token(self, token: str):
         try:
             logger.debug(f"caching token: {token}")
-            self.redis_hook.set(f"@opensubtitles/{self.api_key}/token", token, ex=60*60)
+            self.redis.set(f"@opensubtitles/{self.api_key}/token", token, ex=60*60)
         except Exception as e:
             logger.error(f"Error setting cached token: {e}")
 

{plexflow-0.0.71 → plexflow-0.0.73}/plexflow/core/subtitles/providers/oss/search.py

@@ -5,9 +5,10 @@ from plexflow.core.subtitles.providers.oss.oss_subtitle import OSSSubtitle
 from typing import Any, List
 from contextlib import contextmanager, ExitStack
 from plexflow.utils.hooks.redis import UniversalRedisHook
+import redis
 
 @contextmanager
-def open_subtitles_manager(credentials_path: str, redis_hook: UniversalRedisHook = None, **kwargs: Any):
+def open_subtitles_manager(credentials_path: str, r: redis.Redis = None, **kwargs: Any):
     """
     Context manager for managing the OpenSubtitlesManager instance.
 
@@ -22,12 +23,12 @@ def open_subtitles_manager(credentials_path: str, redis_hook: UniversalRedisHook
     with ExitStack() as stack:
         manager = stack.enter_context(OpenSubtitlesManager.from_yaml(
             yaml_file=credentials_path,
-            redis_hook=redis_hook,
+            r=r,
             **kwargs
         ))
         yield manager
 
-def get_subtitles(imdb_id: str, languages: List[str] = (), redis_hook: UniversalRedisHook = None, ignore_blacklist: bool = False, **kwargs) -> List[OSSSubtitle]:
+def get_subtitles(imdb_id: str, languages: List[str] = (), r: redis.Redis = None, ignore_blacklist: bool = False, **kwargs) -> List[OSSSubtitle]:
     """
     Retrieves subtitles using OpenSubtitlesManager.
 
@@ -40,7 +41,7 @@ def get_subtitles(imdb_id: str, languages: List[str] = (), redis_hook: Universal
     """
     with open_subtitles_manager(
         credentials_path=kwargs.pop("credentials_path"),
-        redis_hook=redis_hook,
+        r=r,
         ignore_blacklist=ignore_blacklist,
     ) as manager:
         subtitles = manager.search(

{plexflow-0.0.71 → plexflow-0.0.73}/plexflow/core/subtitles/providers/oss/unlimited_oss.py

@@ -53,7 +53,7 @@ class OpenSubtitlesManager:
     REDIS_DEFAULT_PORT = 6379
     DEFAULT_TTL = 60*60  # 1 hour
 
-    def __init__(self, credentials: List[Dict[str, str]], redis_hook: UniversalRedisHook = None, **kwargs):
+    def __init__(self, credentials: List[Dict[str, str]], r: redis.Redis = None, **kwargs):
         """
         Initializes an instance of the OpenSubtitlesManager class.
 
@@ -64,7 +64,7 @@ class OpenSubtitlesManager:
             redis_port (int, optional): The port of the Redis server used for blacklisting credentials. Defaults to 6379.
         """
         self.credentials = credentials
-        self.redis_hook = redis_hook
+        self.redis = r
         self.current_instance = None
         self.current_credential = None
         self.ignore_blacklist = kwargs.get('ignore_blacklist', False)
@@ -72,7 +72,7 @@ class OpenSubtitlesManager:
         self.instances = {}
         
     @classmethod
-    def from_yaml(cls, yaml_file: str, redis_hook: UniversalRedisHook = None, **kwargs) -> 'OpenSubtitlesManager':
+    def from_yaml(cls, yaml_file: str, r: redis.Redis = None, **kwargs) -> 'OpenSubtitlesManager':
         """
         Creates an instance of the OpenSubtitlesManager class from a YAML file.
 
@@ -86,7 +86,7 @@ class OpenSubtitlesManager:
         """
         with open(yaml_file, 'r') as file:
             credentials = yaml.safe_load(file)
-        return cls(credentials=credentials, redis_hook=redis_hook, **kwargs)
+        return cls(credentials=credentials, r=r, **kwargs)
 
     def __enter__(self) -> OpenSubtitles:
         """
@@ -181,7 +181,7 @@ class OpenSubtitlesManager:
         if api_key in self.instances:
             return self.instances[api_key]
         
-        instance = OpenSubtitles(user_agent, api_key, redis_hook=self.redis_hook)
+        instance = OpenSubtitles(user_agent, api_key, r=self.redis)
         instance.login(username, password)
         
         # Cache the instance for later reuse
@@ -201,7 +201,7 @@ class OpenSubtitlesManager:
         """
         key = self.generate_credential_key(credential)
         self.logger.debug(f"Generated credential key: {key}")
-        return self.redis_hook.get_conn().exists(key)
+        return self.redis.exists(key)
 
     def blacklist_credential(self):
         """
@@ -209,7 +209,7 @@ class OpenSubtitlesManager:
 
         """
         key = self.generate_credential_key(self.current_credential)
-        self.redis_hook.get_conn().setex(key, self.DEFAULT_TTL, 'blacklisted')
+        self.redis.setex(key, self.DEFAULT_TTL, 'blacklisted')
         self.logger.debug(f"Credential blacklisted for {self.DEFAULT_TTL} seconds: {self.current_credential}")
         self.logger.debug(f"Blacklisted credential key: {key}")
 

{plexflow-0.0.71 → plexflow-0.0.73}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "plexflow"
-version = "0.0.71"
+version = "0.0.73"
 description = "A short description of the package."
 authors = ["Your Name <you@example.com>"]
 license = "MIT"