Fix remoteCDM, add curl_cffi to instance check

This commit is contained in:
TPD94
2025-09-29 20:48:59 -04:00
parent a2c6798fe6
commit 2e2f8f5099
4 changed files with 23 additions and 5 deletions

6
.gitignore vendored
View File

@@ -235,3 +235,9 @@ cython_debug/
marimo/_static/
marimo/_lsp/
__marimo__/
.idea/vcs.xml
.idea/unshackle.iml
.idea/modules.xml
.idea/misc.xml
.idea/inspectionProfiles/Project_Default.xml
.idea/inspectionProfiles/profiles_settings.xml

8
.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@@ -1701,10 +1701,14 @@ class dl:
# All DecryptLabs CDMs use DecryptLabsRemoteCDM
return DecryptLabsRemoteCDM(service_name=service, vaults=self.vaults, **cdm_api)
else:
del cdm_api["name"]
if "type" in cdm_api:
del cdm_api["type"]
return RemoteCdm(**cdm_api)
return RemoteCdm(
device_type=cdm_api['Device Type'],
system_id=cdm_api['System ID'],
security_level=cdm_api['Security Level'],
host=cdm_api['Host'],
secret=cdm_api['Secret'],
device_name=cdm_api['Device Name'],
)
prd_path = config.directories.prds / f"{cdm_name}.prd"
if not prd_path.is_file():

View File

@@ -253,7 +253,7 @@ class DASH:
):
if not session:
session = Session()
elif not isinstance(session, Session):
elif not isinstance(session, (Session, CurlSession)):
raise TypeError(f"Expected session to be a {Session}, not {session!r}")
if proxy: