diff --git a/external/werift b/external/werift index 91be7cf46..140faa891 160000 --- a/external/werift +++ b/external/werift @@ -1 +1 @@ -Subproject commit 91be7cf46954a2da679d417f754653f474043cd6 +Subproject commit 140faa891d6bb0156ae846023dc5daee3b3302fa diff --git a/plugins/opencv/package-lock.json b/plugins/opencv/package-lock.json index 697c9c79d..8668990fd 100644 --- a/plugins/opencv/package-lock.json +++ b/plugins/opencv/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/opencv", - "version": "0.0.76", + "version": "0.0.79", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/opencv", - "version": "0.0.76", + "version": "0.0.79", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/opencv/package.json b/plugins/opencv/package.json index 4048ede99..3e2a16ba6 100644 --- a/plugins/opencv/package.json +++ b/plugins/opencv/package.json @@ -36,5 +36,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.0.76" + "version": "0.0.79" } diff --git a/sdk/types/scrypted_python/scrypted_sdk/types.py b/sdk/types/scrypted_python/scrypted_sdk/types.py index 0092b0487..2afa61306 100644 --- a/sdk/types/scrypted_python/scrypted_sdk/types.py +++ b/sdk/types/scrypted_python/scrypted_sdk/types.py @@ -1,11 +1,10 @@ from __future__ import annotations from enum import Enum try: - from typing import TypedDict, Union + from typing import TypedDict except: - from typing_extensions import TypedDict, Union -from typing import Any -from typing import Callable + from typing_extensions import TypedDict +from typing import Union, Any, Callable from .other import * diff --git a/sdk/types/src/build.ts b/sdk/types/src/build.ts index 6c83a5ca2..f1fe7684d 100644 --- a/sdk/types/src/build.ts +++ b/sdk/types/src/build.ts @@ -267,11 +267,10 @@ class ${td.name}(TypedDict): const pythonTypes = `from __future__ import annotations from enum import Enum try: - from typing import TypedDict, Union + from typing import TypedDict except: - from typing_extensions import TypedDict, Union -from typing import Any -from typing import Callable + from typing_extensions import TypedDict +from typing import Union, Any, Callable from .other import * diff --git a/sdk/types/src/types.input.ts b/sdk/types/src/types.input.ts index 3890276d7..67ab835da 100644 --- a/sdk/types/src/types.input.ts +++ b/sdk/types/src/types.input.ts @@ -1330,7 +1330,7 @@ export interface ObjectDetectionZone { * E.g. TensorFlow, OpenCV, or a Coral TPU. */ export interface ObjectDetection { - generateObjectDetections(videoFrames: AsyncGenerator, session: ObjectDetectionGeneratorSession): Promise>; + generateObjectDetections(videoFrames: AsyncGenerator, session: ObjectDetectionGeneratorSession): Promise>; detectObjects(mediaObject: MediaObject, session?: ObjectDetectionSession): Promise; getDetectionModel(settings?: { [key: string]: any }): Promise; }