diff --git a/examples/applications/car_wrong_direction_detection.ipynb b/examples/applications/car_wrong_direction_detection.ipynb index 1cb8a1f..b031cf6 100644 --- a/examples/applications/car_wrong_direction_detection.ipynb +++ b/examples/applications/car_wrong_direction_detection.ipynb @@ -112,7 +112,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "id": "fea1e8c8", "metadata": { "tags": [] @@ -172,7 +172,7 @@ "linecross_notifier = degirum_tools.EventNotifier(\n", " \"Wrong Direction\",\n", " event_name,\n", - " message=\"{time}: {result.events_detected} ({url})\",\n", + " message=\"${time}: ${result.events_detected} (${url})\",\n", " annotation_pos=annotation_pos,\n", " annotation_color=(255, 0, 0),\n", " annotation_cool_down=1.0,\n", diff --git a/examples/applications/smart_nvr.ipynb b/examples/applications/smart_nvr.ipynb index 69eb75d..4305f46 100644 --- a/examples/applications/smart_nvr.ipynb +++ b/examples/applications/smart_nvr.ipynb @@ -111,7 +111,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "id": "65d4cd90", "metadata": { "tags": [] @@ -170,7 +170,7 @@ "notifier = degirum_tools.EventNotifier(\n", " event_name,\n", " event_name,\n", - " message=\"{time}: person is detected in zone\",\n", + " message=\"${time}: person is detected in zone\",\n", " holdoff=holdoff_sec,\n", " notification_config=notification_config,\n", " clip_save=True,\n", diff --git a/examples/specialized/advanced_tiling_strategies.ipynb b/examples/specialized/advanced_tiling_strategies.ipynb index e76d50a..9801d12 100644 --- a/examples/specialized/advanced_tiling_strategies.ipynb +++ b/examples/specialized/advanced_tiling_strategies.ipynb @@ -74,8 +74,8 @@ "# class_set: whitelist for classes to detect\n", "hw_location = \"@cloud\"\n", "zoo_name = \"https://hub.degirum.com/degirum/visdrone\"\n", - "model_name = 'yolov8s_relu6_visdrone--640x640_quant_n2x_orca1_1'\n", - "image_source = '../../images/ParkingLot.jpg'\n", + "model_name = \"yolov8s_relu6_visdrone--640x640_quant_n2x_orca1_1\"\n", + "image_source = \"../../images/ParkingLot.jpg\"\n", "class_set = {\"car\"}" ] }, @@ -88,7 +88,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "metadata": {}, "outputs": [], "source": [ @@ -96,8 +96,15 @@ "import degirum as dg\n", "import degirum_tools as dgt\n", "\n", - "from degirum_tools.tile_compound_models import TileExtractorPseudoModel, TileModel, LocalGlobalTileModel, BoxFusionTileModel, BoxFusionLocalGlobalTileModel\n", - "from degirum_tools import NmsBoxSelectionPolicy, NmsOptions\n", + "from degirum_tools import (\n", + " TileExtractorPseudoModel,\n", + " TileModel,\n", + " LocalGlobalTileModel,\n", + " BoxFusionTileModel,\n", + " BoxFusionLocalGlobalTileModel,\n", + " NmsBoxSelectionPolicy,\n", + " NmsOptions,\n", + ")\n", "\n", "# Base NMS options.\n", "nms_options = NmsOptions(\n", @@ -121,7 +128,9 @@ "outputs": [], "source": [ "# Load model to be used for tiling\n", - "model = dg.load_model(model_name, hw_location, zoo_name, dgt.get_token(), image_backend='pil')\n", + "model = dg.load_model(\n", + " model_name, hw_location, zoo_name, dgt.get_token(), image_backend=\"pil\"\n", + ")\n", "model.output_class_set = class_set # filter class outputss\n", "\n", "results = model(image_source)\n", @@ -148,14 +157,10 @@ "metadata": {}, "outputs": [], "source": [ - "tile_extractor = TileExtractorPseudoModel(cols=3,\n", - " rows=2, \n", - " overlap_percent=0.1, \n", - " model2=model,\n", - " global_tile=False)\n", - "tile_model = TileModel(model1=tile_extractor,\n", - " model2=model,\n", - " nms_options=nms_options)\n", + "tile_extractor = TileExtractorPseudoModel(\n", + " cols=3, rows=2, overlap_percent=0.1, model2=model, global_tile=False\n", + ")\n", + "tile_model = TileModel(model1=tile_extractor, model2=model, nms_options=nms_options)\n", "results = tile_model(image_source)\n", "results.image_overlay" ] @@ -173,15 +178,15 @@ "metadata": {}, "outputs": [], "source": [ - "tile_extractor = TileExtractorPseudoModel(cols=3,\n", - " rows=2, \n", - " overlap_percent=0.1, \n", - " model2=model,\n", - " global_tile=True)\n", - "tile_model = LocalGlobalTileModel(model1=tile_extractor,\n", - " model2=model,\n", - " large_object_threshold=0.01,\n", - " nms_options=nms_options)\n", + "tile_extractor = TileExtractorPseudoModel(\n", + " cols=3, rows=2, overlap_percent=0.1, model2=model, global_tile=True\n", + ")\n", + "tile_model = LocalGlobalTileModel(\n", + " model1=tile_extractor,\n", + " model2=model,\n", + " large_object_threshold=0.01,\n", + " nms_options=nms_options,\n", + ")\n", "results = tile_model(image_source)\n", "results.image_overlay" ] @@ -199,15 +204,12 @@ "metadata": {}, "outputs": [], "source": [ - "tile_extractor = TileExtractorPseudoModel(cols=3,\n", - " rows=2, \n", - " overlap_percent=0.1, \n", - " model2=model,\n", - " global_tile=False)\n", - "tile_model = BoxFusionTileModel(model1=tile_extractor,\n", - " model2=model,\n", - " edge_threshold=0.02,\n", - " fusion_threshold=0.8)\n", + "tile_extractor = TileExtractorPseudoModel(\n", + " cols=3, rows=2, overlap_percent=0.1, model2=model, global_tile=False\n", + ")\n", + "tile_model = BoxFusionTileModel(\n", + " model1=tile_extractor, model2=model, edge_threshold=0.02, fusion_threshold=0.8\n", + ")\n", "results = tile_model(image_source)\n", "results.image_overlay" ] @@ -225,17 +227,17 @@ "metadata": {}, "outputs": [], "source": [ - "tile_extractor = TileExtractorPseudoModel(cols=3,\n", - " rows=2, \n", - " overlap_percent=0.1, \n", - " model2=model,\n", - " global_tile=True)\n", - "tile_model = BoxFusionLocalGlobalTileModel(model1=tile_extractor,\n", - " model2=model,\n", - " large_object_threshold=0.01, \n", - " edge_threshold=0.02,\n", - " fusion_threshold=0.8,\n", - " nms_options=nms_options)\n", + "tile_extractor = TileExtractorPseudoModel(\n", + " cols=3, rows=2, overlap_percent=0.1, model2=model, global_tile=True\n", + ")\n", + "tile_model = BoxFusionLocalGlobalTileModel(\n", + " model1=tile_extractor,\n", + " model2=model,\n", + " large_object_threshold=0.01,\n", + " edge_threshold=0.02,\n", + " fusion_threshold=0.8,\n", + " nms_options=nms_options,\n", + ")\n", "results = tile_model(image_source)\n", "results.image_overlay" ] @@ -243,7 +245,7 @@ ], "metadata": { "kernelspec": { - "display_name": "dgenv", + "display_name": "base", "language": "python", "name": "python3" }, @@ -257,7 +259,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.4" + "version": "3.12.3" } }, "nbformat": 4,