plex-api-client 0.5.0__tar.gz → 0.6.1__tar.gz

{plex-api-client-0.5.0/src/plex_api_client.egg-info → plex-api-client-0.6.1}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: plex-api-client
-Version: 0.5.0
+Version: 0.6.1
 Summary: Python Client SDK Generated by Speakeasy
-Home-page: UNKNOWN
+Home-page: https://github.com/LukeHagar/plexpy.git
 Author: LukeHagar
 License: UNKNOWN
 Description: # plexpy
@@ -48,110 +48,110 @@ Description: # plexpy
         <!-- Start Available Resources and Operations [operations] -->
         ## Available Resources and Operations
         
-        ### [server](docs/sdks/server/README.md)
+        ### [server](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/server/README.md)
         
-        * [get_server_capabilities](docs/sdks/server/README.md#get_server_capabilities) - Server Capabilities
-        * [get_server_preferences](docs/sdks/server/README.md#get_server_preferences) - Get Server Preferences
-        * [get_available_clients](docs/sdks/server/README.md#get_available_clients) - Get Available Clients
-        * [get_devices](docs/sdks/server/README.md#get_devices) - Get Devices
-        * [get_server_identity](docs/sdks/server/README.md#get_server_identity) - Get Server Identity
-        * [get_my_plex_account](docs/sdks/server/README.md#get_my_plex_account) - Get MyPlex Account
-        * [get_resized_photo](docs/sdks/server/README.md#get_resized_photo) - Get a Resized Photo
-        * [get_server_list](docs/sdks/server/README.md#get_server_list) - Get Server List
+        * [get_server_capabilities](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/server/README.md#get_server_capabilities) - Server Capabilities
+        * [get_server_preferences](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/server/README.md#get_server_preferences) - Get Server Preferences
+        * [get_available_clients](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/server/README.md#get_available_clients) - Get Available Clients
+        * [get_devices](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/server/README.md#get_devices) - Get Devices
+        * [get_server_identity](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/server/README.md#get_server_identity) - Get Server Identity
+        * [get_my_plex_account](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/server/README.md#get_my_plex_account) - Get MyPlex Account
+        * [get_resized_photo](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/server/README.md#get_resized_photo) - Get a Resized Photo
+        * [get_server_list](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/server/README.md#get_server_list) - Get Server List
         
-        ### [media](docs/sdks/media/README.md)
+        ### [media](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/media/README.md)
         
-        * [mark_played](docs/sdks/media/README.md#mark_played) - Mark Media Played
-        * [mark_unplayed](docs/sdks/media/README.md#mark_unplayed) - Mark Media Unplayed
-        * [update_play_progress](docs/sdks/media/README.md#update_play_progress) - Update Media Play Progress
+        * [mark_played](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/media/README.md#mark_played) - Mark Media Played
+        * [mark_unplayed](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/media/README.md#mark_unplayed) - Mark Media Unplayed
+        * [update_play_progress](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/media/README.md#update_play_progress) - Update Media Play Progress
         
-        ### [video](docs/sdks/video/README.md)
+        ### [video](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/video/README.md)
         
-        * [get_timeline](docs/sdks/video/README.md#get_timeline) - Get the timeline for a media item
-        * [start_universal_transcode](docs/sdks/video/README.md#start_universal_transcode) - Start Universal Transcode
+        * [get_timeline](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/video/README.md#get_timeline) - Get the timeline for a media item
+        * [start_universal_transcode](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/video/README.md#start_universal_transcode) - Start Universal Transcode
         
-        ### [activities](docs/sdks/activities/README.md)
+        ### [activities](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/activities/README.md)
         
-        * [get_server_activities](docs/sdks/activities/README.md#get_server_activities) - Get Server Activities
-        * [cancel_server_activities](docs/sdks/activities/README.md#cancel_server_activities) - Cancel Server Activities
+        * [get_server_activities](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/activities/README.md#get_server_activities) - Get Server Activities
+        * [cancel_server_activities](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/activities/README.md#cancel_server_activities) - Cancel Server Activities
         
-        ### [butler](docs/sdks/butler/README.md)
+        ### [butler](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/butler/README.md)
         
-        * [get_butler_tasks](docs/sdks/butler/README.md#get_butler_tasks) - Get Butler tasks
-        * [start_all_tasks](docs/sdks/butler/README.md#start_all_tasks) - Start all Butler tasks
-        * [stop_all_tasks](docs/sdks/butler/README.md#stop_all_tasks) - Stop all Butler tasks
-        * [start_task](docs/sdks/butler/README.md#start_task) - Start a single Butler task
-        * [stop_task](docs/sdks/butler/README.md#stop_task) - Stop a single Butler task
+        * [get_butler_tasks](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/butler/README.md#get_butler_tasks) - Get Butler tasks
+        * [start_all_tasks](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/butler/README.md#start_all_tasks) - Start all Butler tasks
+        * [stop_all_tasks](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/butler/README.md#stop_all_tasks) - Stop all Butler tasks
+        * [start_task](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/butler/README.md#start_task) - Start a single Butler task
+        * [stop_task](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/butler/README.md#stop_task) - Stop a single Butler task
         
-        ### [hubs](docs/sdks/hubs/README.md)
+        ### [hubs](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/hubs/README.md)
         
-        * [get_global_hubs](docs/sdks/hubs/README.md#get_global_hubs) - Get Global Hubs
-        * [get_library_hubs](docs/sdks/hubs/README.md#get_library_hubs) - Get library specific hubs
+        * [get_global_hubs](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/hubs/README.md#get_global_hubs) - Get Global Hubs
+        * [get_library_hubs](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/hubs/README.md#get_library_hubs) - Get library specific hubs
         
-        ### [search](docs/sdks/search/README.md)
+        ### [search](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/search/README.md)
         
-        * [perform_search](docs/sdks/search/README.md#perform_search) - Perform a search
-        * [perform_voice_search](docs/sdks/search/README.md#perform_voice_search) - Perform a voice search
-        * [get_search_results](docs/sdks/search/README.md#get_search_results) - Get Search Results
+        * [perform_search](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/search/README.md#perform_search) - Perform a search
+        * [perform_voice_search](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/search/README.md#perform_voice_search) - Perform a voice search
+        * [get_search_results](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/search/README.md#get_search_results) - Get Search Results
         
-        ### [library](docs/sdks/library/README.md)
+        ### [library](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md)
         
-        * [get_file_hash](docs/sdks/library/README.md#get_file_hash) - Get Hash Value
-        * [get_recently_added](docs/sdks/library/README.md#get_recently_added) - Get Recently Added
-        * [get_libraries](docs/sdks/library/README.md#get_libraries) - Get All Libraries
-        * [get_library](docs/sdks/library/README.md#get_library) - Get Library Details
-        * [delete_library](docs/sdks/library/README.md#delete_library) - Delete Library Section
-        * [get_library_items](docs/sdks/library/README.md#get_library_items) - Get Library Items
-        * [refresh_library](docs/sdks/library/README.md#refresh_library) - Refresh Library
-        * [search_library](docs/sdks/library/README.md#search_library) - Search Library
-        * [get_metadata](docs/sdks/library/README.md#get_metadata) - Get Items Metadata
-        * [get_metadata_children](docs/sdks/library/README.md#get_metadata_children) - Get Items Children
-        * [get_on_deck](docs/sdks/library/README.md#get_on_deck) - Get On Deck
+        * [get_file_hash](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#get_file_hash) - Get Hash Value
+        * [get_recently_added](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#get_recently_added) - Get Recently Added
+        * [get_libraries](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#get_libraries) - Get All Libraries
+        * [get_library](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#get_library) - Get Library Details
+        * [delete_library](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#delete_library) - Delete Library Section
+        * [get_library_items](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#get_library_items) - Get Library Items
+        * [refresh_library](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#refresh_library) - Refresh Library
+        * [search_library](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#search_library) - Search Library
+        * [get_metadata](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#get_metadata) - Get Items Metadata
+        * [get_metadata_children](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#get_metadata_children) - Get Items Children
+        * [get_on_deck](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/library/README.md#get_on_deck) - Get On Deck
         
-        ### [log](docs/sdks/log/README.md)
+        ### [log](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/log/README.md)
         
-        * [log_line](docs/sdks/log/README.md#log_line) - Logging a single line message.
-        * [log_multi_line](docs/sdks/log/README.md#log_multi_line) - Logging a multi-line message
-        * [enable_paper_trail](docs/sdks/log/README.md#enable_paper_trail) - Enabling Papertrail
+        * [log_line](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/log/README.md#log_line) - Logging a single line message.
+        * [log_multi_line](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/log/README.md#log_multi_line) - Logging a multi-line message
+        * [enable_paper_trail](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/log/README.md#enable_paper_trail) - Enabling Papertrail
         
-        ### [plex](docs/sdks/plex/README.md)
+        ### [plex](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/plex/README.md)
         
-        * [get_pin](docs/sdks/plex/README.md#get_pin) - Get a Pin
-        * [get_token](docs/sdks/plex/README.md#get_token) - Get Access Token
+        * [get_pin](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/plex/README.md#get_pin) - Get a Pin
+        * [get_token](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/plex/README.md#get_token) - Get Access Token
         
-        ### [playlists](docs/sdks/playlists/README.md)
+        ### [playlists](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md)
         
-        * [create_playlist](docs/sdks/playlists/README.md#create_playlist) - Create a Playlist
-        * [get_playlists](docs/sdks/playlists/README.md#get_playlists) - Get All Playlists
-        * [get_playlist](docs/sdks/playlists/README.md#get_playlist) - Retrieve Playlist
-        * [delete_playlist](docs/sdks/playlists/README.md#delete_playlist) - Deletes a Playlist
-        * [update_playlist](docs/sdks/playlists/README.md#update_playlist) - Update a Playlist
-        * [get_playlist_contents](docs/sdks/playlists/README.md#get_playlist_contents) - Retrieve Playlist Contents
-        * [clear_playlist_contents](docs/sdks/playlists/README.md#clear_playlist_contents) - Delete Playlist Contents
-        * [add_playlist_contents](docs/sdks/playlists/README.md#add_playlist_contents) - Adding to a Playlist
-        * [upload_playlist](docs/sdks/playlists/README.md#upload_playlist) - Upload Playlist
+        * [create_playlist](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md#create_playlist) - Create a Playlist
+        * [get_playlists](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md#get_playlists) - Get All Playlists
+        * [get_playlist](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md#get_playlist) - Retrieve Playlist
+        * [delete_playlist](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md#delete_playlist) - Deletes a Playlist
+        * [update_playlist](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md#update_playlist) - Update a Playlist
+        * [get_playlist_contents](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md#get_playlist_contents) - Retrieve Playlist Contents
+        * [clear_playlist_contents](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md#clear_playlist_contents) - Delete Playlist Contents
+        * [add_playlist_contents](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md#add_playlist_contents) - Adding to a Playlist
+        * [upload_playlist](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/playlists/README.md#upload_playlist) - Upload Playlist
         
-        ### [authentication](docs/sdks/authentication/README.md)
+        ### [authentication](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/authentication/README.md)
         
-        * [get_transient_token](docs/sdks/authentication/README.md#get_transient_token) - Get a Transient Token.
-        * [get_source_connection_information](docs/sdks/authentication/README.md#get_source_connection_information) - Get Source Connection Information
+        * [get_transient_token](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/authentication/README.md#get_transient_token) - Get a Transient Token.
+        * [get_source_connection_information](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/authentication/README.md#get_source_connection_information) - Get Source Connection Information
         
-        ### [statistics](docs/sdks/statistics/README.md)
+        ### [statistics](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/statistics/README.md)
         
-        * [get_statistics](docs/sdks/statistics/README.md#get_statistics) - Get Media Statistics
+        * [get_statistics](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/statistics/README.md#get_statistics) - Get Media Statistics
         
-        ### [sessions](docs/sdks/sessions/README.md)
+        ### [sessions](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/sessions/README.md)
         
-        * [get_sessions](docs/sdks/sessions/README.md#get_sessions) - Get Active Sessions
-        * [get_session_history](docs/sdks/sessions/README.md#get_session_history) - Get Session History
-        * [get_transcode_sessions](docs/sdks/sessions/README.md#get_transcode_sessions) - Get Transcode Sessions
-        * [stop_transcode_session](docs/sdks/sessions/README.md#stop_transcode_session) - Stop a Transcode Session
+        * [get_sessions](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/sessions/README.md#get_sessions) - Get Active Sessions
+        * [get_session_history](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/sessions/README.md#get_session_history) - Get Session History
+        * [get_transcode_sessions](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/sessions/README.md#get_transcode_sessions) - Get Transcode Sessions
+        * [stop_transcode_session](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/sessions/README.md#stop_transcode_session) - Stop a Transcode Session
         
-        ### [updater](docs/sdks/updater/README.md)
+        ### [updater](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/updater/README.md)
         
-        * [get_update_status](docs/sdks/updater/README.md#get_update_status) - Querying status of updates
-        * [check_for_updates](docs/sdks/updater/README.md#check_for_updates) - Checking for updates
-        * [apply_updates](docs/sdks/updater/README.md#apply_updates) - Apply Updates
+        * [get_update_status](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/updater/README.md#get_update_status) - Querying status of updates
+        * [check_for_updates](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/updater/README.md#check_for_updates) - Checking for updates
+        * [apply_updates](https://github.com/LukeHagar/plexpy/blob/master/docs/sdks/updater/README.md#apply_updates) - Apply Updates
         <!-- End Available Resources and Operations [operations] -->
         
         <!-- Start Error Handling [errors] -->
@@ -162,7 +162,7 @@ Description: # plexpy
         | Error Object                             | Status Code                              | Content Type                             |
         | ---------------------------------------- | ---------------------------------------- | ---------------------------------------- |
         | errors.GetServerCapabilitiesResponseBody | 401                                      | application/json                         |
-        | errors.SDKError                          | 4x-5xx                                   | */*                                      |
+        | errors.SDKError                          | 4xx-5xx                                  | */*                                      |
         
         ### Example
         
@@ -284,7 +284,7 @@ Description: # plexpy
         
         http_client = requests.Session()
         http_client.headers.update({'x-custom-header': 'someValue'})
-        s = plex_api.PlexAPI(client: http_client)
+        s = plex_api.PlexAPI(client=http_client)
         ```
         <!-- End Custom HTTP Client [http-client] -->
         

{plex-api-client-0.5.0 → plex-api-client-0.6.1}/README.md

@@ -155,7 +155,7 @@ Handling errors in this SDK should largely match your expectations.  All operati
 | Error Object                             | Status Code                              | Content Type                             |
 | ---------------------------------------- | ---------------------------------------- | ---------------------------------------- |
 | errors.GetServerCapabilitiesResponseBody | 401                                      | application/json                         |
-| errors.SDKError                          | 4x-5xx                                   | */*                                      |
+| errors.SDKError                          | 4xx-5xx                                  | */*                                      |
 
 ### Example
 
@@ -277,7 +277,7 @@ import requests
 
 http_client = requests.Session()
 http_client.headers.update({'x-custom-header': 'someValue'})
-s = plex_api.PlexAPI(client: http_client)
+s = plex_api.PlexAPI(client=http_client)
 ```
 <!-- End Custom HTTP Client [http-client] -->
 

plex-api-client-0.6.1/setup.py

@@ -0,0 +1,53 @@
+"""Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
+
+import setuptools
+import re
+
+try:
+    with open('README.md', 'r') as fh:
+        long_description = fh.read()
+        GITHUB_URL = 'https://github.com/LukeHagar/plexpy.git'
+        GITHUB_URL = GITHUB_URL[: -len('.git')] if GITHUB_URL.endswith('.git') else GITHUB_URL
+        # links on PyPI should have absolute URLs
+        long_description = re.sub(
+            r'(\[[^\]]+\]\()((?!https?:)[^\)]+)(\))',
+            lambda m: m.group(1) + GITHUB_URL + '/blob/master/' + m.group(2) + m.group(3),
+            long_description,
+        )
+except FileNotFoundError:
+    long_description = ''
+
+setuptools.setup(
+    name='plex-api-client',
+    version='0.6.1',
+    author='LukeHagar',
+    description='Python Client SDK Generated by Speakeasy',
+    url='https://github.com/LukeHagar/plexpy.git',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    packages=setuptools.find_packages(where='src'),
+    install_requires=[
+        "certifi>=2023.7.22",
+        "charset-normalizer>=3.2.0",
+        "dataclasses-json>=0.6.4",
+        "idna>=3.4",
+        "jsonpath-python>=1.0.6",
+        "marshmallow>=3.19.0",
+        "mypy-extensions>=1.0.0",
+        "packaging>=23.1",
+        "python-dateutil>=2.8.2",
+        "requests>=2.31.0",
+        "six>=1.16.0",
+        "typing-inspect>=0.9.0",
+        "typing_extensions>=4.7.1",
+        "urllib3>=1.26.18",
+    ],
+    extras_require={
+        "dev": [
+            "pylint==2.16.2",
+        ],
+    },
+    package_dir={'': 'src'},
+    python_requires='>=3.8',
+    package_data={'plex-api-client': ['py.typed']},
+)

{plex-api-client-0.5.0 → plex-api-client-0.6.1}/src/plex_api/_hooks/sdkhooks.py

@@ -3,7 +3,7 @@
 import requests
 from .types import SDKInitHook, BeforeRequestContext, BeforeRequestHook, AfterSuccessContext, AfterSuccessHook, AfterErrorContext, AfterErrorHook, Hooks
 from .registration import init_hooks
-from typing import List, Optional, Tuple, Union
+from typing import List, Optional, Tuple
 
 
 class SDKHooks(Hooks):
@@ -31,19 +31,21 @@ class SDKHooks(Hooks):
             base_url, client = hook.sdk_init(base_url, client)
         return base_url, client
 
-    def before_request(self, hook_ctx: BeforeRequestContext, request: requests.PreparedRequest) -> Union[requests.PreparedRequest, Exception]:
+    def before_request(self, hook_ctx: BeforeRequestContext, request: requests.PreparedRequest) -> requests.PreparedRequest:
         for hook in self.before_request_hooks:
-            request = hook.before_request(hook_ctx, request)
-            if isinstance(request, Exception):
-                raise request
+            out = hook.before_request(hook_ctx, request)
+            if isinstance(out, Exception):
+                raise out
+            request = out
 
         return request
 
     def after_success(self, hook_ctx: AfterSuccessContext, response: requests.Response) -> requests.Response:
         for hook in self.after_success_hooks:
-            response = hook.after_success(hook_ctx, response)
-            if isinstance(response, Exception):
-                raise response
+            out = hook.after_success(hook_ctx, response)
+            if isinstance(out, Exception):
+                raise out
+            response = out
         return response
 
     def after_error(self, hook_ctx: AfterErrorContext, response: Optional[requests.Response], error: Optional[Exception]) -> Tuple[Optional[requests.Response], Optional[Exception]]:

{plex-api-client-0.5.0 → plex-api-client-0.6.1}/src/plex_api/_hooks/types.py

@@ -17,15 +17,19 @@ class HookContext:
 
 
 class BeforeRequestContext(HookContext):
-    pass
+    def __init__(self, hook_ctx: HookContext):
+        super().__init__(hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source)
 
 
 class AfterSuccessContext(HookContext):
-    pass
+    def __init__(self, hook_ctx: HookContext):
+        super().__init__(hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source)
+    
 
 
 class AfterErrorContext(HookContext):
-    pass
+    def __init__(self, hook_ctx: HookContext):
+        super().__init__(hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source)
 
 
 class SDKInitHook(ABC):

{plex-api-client-0.5.0 → plex-api-client-0.6.1}/src/plex_api/activities.py

@@ -3,7 +3,7 @@
 import requests as requests_http
 from .sdkconfiguration import SDKConfiguration
 from plex_api import utils
-from plex_api._hooks import HookContext
+from plex_api._hooks import AfterErrorContext, AfterSuccessContext, BeforeRequestContext, HookContext
 from plex_api.models import errors, operations
 from typing import Optional
 
@@ -42,30 +42,29 @@ class Activities:
         client = self.sdk_configuration.client
         
         try:
-            req = self.sdk_configuration.get_hooks().before_request(
-                hook_ctx, 
-                requests_http.Request('GET', url, params=query_params, headers=headers).prepare(),
-            )
+            req = client.prepare_request(requests_http.Request('GET', url, params=query_params, headers=headers))
+            req = self.sdk_configuration.get_hooks().before_request(BeforeRequestContext(hook_ctx), req)
             http_res = client.send(req)
         except Exception as e:
-            _, e = self.sdk_configuration.get_hooks().after_error(hook_ctx, None, e)
-            raise e
+            _, e = self.sdk_configuration.get_hooks().after_error(AfterErrorContext(hook_ctx), None, e)
+            if e is not None:
+                raise e
 
         if utils.match_status_codes(['400','401','4XX','5XX'], http_res.status_code):
-            http_res, e = self.sdk_configuration.get_hooks().after_error(hook_ctx, http_res, None)
-            if e:
+            result, e = self.sdk_configuration.get_hooks().after_error(AfterErrorContext(hook_ctx), http_res, None)
+            if e is not None:
                 raise e
+            if result is not None:
+                http_res = result
         else:
-            result = self.sdk_configuration.get_hooks().after_success(hook_ctx, http_res)
-            if isinstance(result, Exception):
-                raise result
-            http_res = result
+            http_res = self.sdk_configuration.get_hooks().after_success(AfterSuccessContext(hook_ctx), http_res)
+            
         
         
-        res = operations.GetServerActivitiesResponse(status_code=http_res.status_code, content_type=http_res.headers.get('Content-Type'), raw_response=http_res)
+        res = operations.GetServerActivitiesResponse(status_code=http_res.status_code, content_type=http_res.headers.get('Content-Type') or '', raw_response=http_res)
         
         if http_res.status_code == 200:
-            if utils.match_content_type(http_res.headers.get('Content-Type'), 'application/json'):                
+            if utils.match_content_type(http_res.headers.get('Content-Type') or '', 'application/json'):                
                 out = utils.unmarshal_json(http_res.text, Optional[operations.GetServerActivitiesResponseBody])
                 res.object = out
             else:
@@ -74,7 +73,7 @@ class Activities:
         elif http_res.status_code == 400 or http_res.status_code >= 400 and http_res.status_code < 500 or http_res.status_code >= 500 and http_res.status_code < 600:
             raise errors.SDKError('API error occurred', http_res.status_code, http_res.text, http_res)
         elif http_res.status_code == 401:
-            if utils.match_content_type(http_res.headers.get('Content-Type'), 'application/json'):                
+            if utils.match_content_type(http_res.headers.get('Content-Type') or '', 'application/json'):                
                 out = utils.unmarshal_json(http_res.text, errors.GetServerActivitiesResponseBody)
                 out.raw_response = http_res
                 raise out
@@ -111,34 +110,33 @@ class Activities:
         client = self.sdk_configuration.client
         
         try:
-            req = self.sdk_configuration.get_hooks().before_request(
-                hook_ctx, 
-                requests_http.Request('DELETE', url, params=query_params, headers=headers).prepare(),
-            )
+            req = client.prepare_request(requests_http.Request('DELETE', url, params=query_params, headers=headers))
+            req = self.sdk_configuration.get_hooks().before_request(BeforeRequestContext(hook_ctx), req)
             http_res = client.send(req)
         except Exception as e:
-            _, e = self.sdk_configuration.get_hooks().after_error(hook_ctx, None, e)
-            raise e
+            _, e = self.sdk_configuration.get_hooks().after_error(AfterErrorContext(hook_ctx), None, e)
+            if e is not None:
+                raise e
 
         if utils.match_status_codes(['400','401','4XX','5XX'], http_res.status_code):
-            http_res, e = self.sdk_configuration.get_hooks().after_error(hook_ctx, http_res, None)
-            if e:
+            result, e = self.sdk_configuration.get_hooks().after_error(AfterErrorContext(hook_ctx), http_res, None)
+            if e is not None:
                 raise e
+            if result is not None:
+                http_res = result
         else:
-            result = self.sdk_configuration.get_hooks().after_success(hook_ctx, http_res)
-            if isinstance(result, Exception):
-                raise result
-            http_res = result
+            http_res = self.sdk_configuration.get_hooks().after_success(AfterSuccessContext(hook_ctx), http_res)
+            
         
         
-        res = operations.CancelServerActivitiesResponse(status_code=http_res.status_code, content_type=http_res.headers.get('Content-Type'), raw_response=http_res)
+        res = operations.CancelServerActivitiesResponse(status_code=http_res.status_code, content_type=http_res.headers.get('Content-Type') or '', raw_response=http_res)
         
         if http_res.status_code == 200:
             pass
         elif http_res.status_code == 400 or http_res.status_code >= 400 and http_res.status_code < 500 or http_res.status_code >= 500 and http_res.status_code < 600:
             raise errors.SDKError('API error occurred', http_res.status_code, http_res.text, http_res)
         elif http_res.status_code == 401:
-            if utils.match_content_type(http_res.headers.get('Content-Type'), 'application/json'):                
+            if utils.match_content_type(http_res.headers.get('Content-Type') or '', 'application/json'):                
                 out = utils.unmarshal_json(http_res.text, errors.CancelServerActivitiesResponseBody)
                 out.raw_response = http_res
                 raise out

{plex-api-client-0.5.0 → plex-api-client-0.6.1}/src/plex_api/authentication.py

@@ -3,7 +3,7 @@
 import requests as requests_http
 from .sdkconfiguration import SDKConfiguration
 from plex_api import utils
-from plex_api._hooks import HookContext
+from plex_api._hooks import AfterErrorContext, AfterSuccessContext, BeforeRequestContext, HookContext
 from plex_api.models import errors, operations
 
 class Authentication:
@@ -40,34 +40,33 @@ class Authentication:
         client = self.sdk_configuration.client
         
         try:
-            req = self.sdk_configuration.get_hooks().before_request(
-                hook_ctx, 
-                requests_http.Request('GET', url, params=query_params, headers=headers).prepare(),
-            )
+            req = client.prepare_request(requests_http.Request('GET', url, params=query_params, headers=headers))
+            req = self.sdk_configuration.get_hooks().before_request(BeforeRequestContext(hook_ctx), req)
             http_res = client.send(req)
         except Exception as e:
-            _, e = self.sdk_configuration.get_hooks().after_error(hook_ctx, None, e)
-            raise e
+            _, e = self.sdk_configuration.get_hooks().after_error(AfterErrorContext(hook_ctx), None, e)
+            if e is not None:
+                raise e
 
         if utils.match_status_codes(['400','401','4XX','5XX'], http_res.status_code):
-            http_res, e = self.sdk_configuration.get_hooks().after_error(hook_ctx, http_res, None)
-            if e:
+            result, e = self.sdk_configuration.get_hooks().after_error(AfterErrorContext(hook_ctx), http_res, None)
+            if e is not None:
                 raise e
+            if result is not None:
+                http_res = result
         else:
-            result = self.sdk_configuration.get_hooks().after_success(hook_ctx, http_res)
-            if isinstance(result, Exception):
-                raise result
-            http_res = result
+            http_res = self.sdk_configuration.get_hooks().after_success(AfterSuccessContext(hook_ctx), http_res)
+            
         
         
-        res = operations.GetTransientTokenResponse(status_code=http_res.status_code, content_type=http_res.headers.get('Content-Type'), raw_response=http_res)
+        res = operations.GetTransientTokenResponse(status_code=http_res.status_code, content_type=http_res.headers.get('Content-Type') or '', raw_response=http_res)
         
         if http_res.status_code == 200:
             pass
         elif http_res.status_code == 400 or http_res.status_code >= 400 and http_res.status_code < 500 or http_res.status_code >= 500 and http_res.status_code < 600:
             raise errors.SDKError('API error occurred', http_res.status_code, http_res.text, http_res)
         elif http_res.status_code == 401:
-            if utils.match_content_type(http_res.headers.get('Content-Type'), 'application/json'):                
+            if utils.match_content_type(http_res.headers.get('Content-Type') or '', 'application/json'):                
                 out = utils.unmarshal_json(http_res.text, errors.GetTransientTokenResponseBody)
                 out.raw_response = http_res
                 raise out
@@ -106,34 +105,33 @@ class Authentication:
         client = self.sdk_configuration.client
         
         try:
-            req = self.sdk_configuration.get_hooks().before_request(
-                hook_ctx, 
-                requests_http.Request('GET', url, params=query_params, headers=headers).prepare(),
-            )
+            req = client.prepare_request(requests_http.Request('GET', url, params=query_params, headers=headers))
+            req = self.sdk_configuration.get_hooks().before_request(BeforeRequestContext(hook_ctx), req)
             http_res = client.send(req)
         except Exception as e:
-            _, e = self.sdk_configuration.get_hooks().after_error(hook_ctx, None, e)
-            raise e
+            _, e = self.sdk_configuration.get_hooks().after_error(AfterErrorContext(hook_ctx), None, e)
+            if e is not None:
+                raise e
 
         if utils.match_status_codes(['400','401','4XX','5XX'], http_res.status_code):
-            http_res, e = self.sdk_configuration.get_hooks().after_error(hook_ctx, http_res, None)
-            if e:
+            result, e = self.sdk_configuration.get_hooks().after_error(AfterErrorContext(hook_ctx), http_res, None)
+            if e is not None:
                 raise e
+            if result is not None:
+                http_res = result
         else:
-            result = self.sdk_configuration.get_hooks().after_success(hook_ctx, http_res)
-            if isinstance(result, Exception):
-                raise result
-            http_res = result
+            http_res = self.sdk_configuration.get_hooks().after_success(AfterSuccessContext(hook_ctx), http_res)
+            
         
         
-        res = operations.GetSourceConnectionInformationResponse(status_code=http_res.status_code, content_type=http_res.headers.get('Content-Type'), raw_response=http_res)
+        res = operations.GetSourceConnectionInformationResponse(status_code=http_res.status_code, content_type=http_res.headers.get('Content-Type') or '', raw_response=http_res)
         
         if http_res.status_code == 200:
             pass
         elif http_res.status_code == 400 or http_res.status_code >= 400 and http_res.status_code < 500 or http_res.status_code >= 500 and http_res.status_code < 600:
             raise errors.SDKError('API error occurred', http_res.status_code, http_res.text, http_res)
         elif http_res.status_code == 401:
-            if utils.match_content_type(http_res.headers.get('Content-Type'), 'application/json'):                
+            if utils.match_content_type(http_res.headers.get('Content-Type') or '', 'application/json'):                
                 out = utils.unmarshal_json(http_res.text, errors.GetSourceConnectionInformationResponseBody)
                 out.raw_response = http_res
                 raise out