hjxdl 0.3.48__py3-none-any.whl → 0.3.50__py3-none-any.whl

hdl/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.48'
-__version_tuple__ = version_tuple = (0, 3, 48)
+__version__ = version = '0.3.50'
+__version_tuple__ = version_tuple = (0, 3, 50)

hdl/utils/vis_tools/scene_detect.py

@@ -138,14 +138,15 @@ def fill_descriptions(
     client,
     input_json,
     output_json,
-    output_dir
+    output_dir,
+    model
 ):
     with open(input_json, "r", encoding="utf-8") as f:
         scenes = json.load(f)
 
     for scene in tqdm(scenes, desc="生成场景描述"):
         img_path = os.path.join(output_dir, scene["image"])
-        scene["description"] = describe_image(img_path, client=client)
+        scene["description"] = describe_image(img_path, client=client, model=model)
         scene.pop("image", None)
 
     with open(output_json, "w", encoding="utf-8") as f:
@@ -171,7 +172,7 @@ class SceneDetector(object):
 
         if not self.temp_json:
             self.temp_json = self.video_file + ".tmp.json"
-        if not self.final_json
+        if not self.final_json:
             self.final_json = self.video_file + ".final.json"
 
         if self.pre_processsing:
@@ -182,7 +183,8 @@ class SceneDetector(object):
 
     def detect(
         self,
-        out_dir
+        out_dir,
+        model
     ):
         output_csv = detect_scenes_cli(self.video_file, out_dir)
         # df = pd.read_csv(output_csv, skiprows=1)
@@ -193,6 +195,7 @@ class SceneDetector(object):
         fill_descriptions(
             self.temp_json,
             self.final_json,
-            out_dir
+            out_dir,
+            model=model
         )
 

{hjxdl-0.3.48.dist-info → hjxdl-0.3.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hjxdl
-Version: 0.3.48
+Version: 0.3.50
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu

{hjxdl-0.3.48.dist-info → hjxdl-0.3.50.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=HakMWBDNRn2Lw-dDW5Jqd_KgJ7xBCMwyZo_L2WGE1yM,513
+hdl/_version.py,sha256=4lAmGHabwGRQzA7ZW_pkNIohlJzGsK8zlLuDaIGyYKE,513
 hdl/args/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/args/loss_args.py,sha256=s7YzSdd7IjD24rZvvOrxLLFqMZQb9YylxKeyelSdrTk,70
 hdl/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -143,11 +143,11 @@ hdl/utils/llm/visrag.py,sha256=0i-VrxqgiV-J7R3VPshu9oc7-rKjFJOldYik3HDXj6M,10176
 hdl/utils/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/schedulers/norm_lr.py,sha256=bDwCmdEK-WkgxQMFBiMuchv8Mm7C0-GZJ6usm-PQk14,4461
 hdl/utils/vis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/vis_tools/scene_detect.py,sha256=T9mQbxbZoeZZIqm8scXSg9-jvtKPzqyiVNtc_ykhxZE,6471
+hdl/utils/vis_tools/scene_detect.py,sha256=XM2oYEl7cnN4vTbxcX7rtzNXWe2ThvmwMXRKix6DMhY,6536
 hdl/utils/weather/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/weather/weather.py,sha256=k11o6wM15kF8b9NMlEfrg68ak-SfSYLN3nOOflFUv-I,4381
-hjxdl-0.3.48.dist-info/licenses/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
-hjxdl-0.3.48.dist-info/METADATA,sha256=s9uYj4yBltF7eBP1yy3kgcyJmDUEB2Nm-CQSzWsqkBY,1332
-hjxdl-0.3.48.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-hjxdl-0.3.48.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.3.48.dist-info/RECORD,,
+hjxdl-0.3.50.dist-info/licenses/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
+hjxdl-0.3.50.dist-info/METADATA,sha256=JhQSTVrCUDr65kahnurqyEuAYO4lEuLK9DAD1M7t94I,1332
+hjxdl-0.3.50.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+hjxdl-0.3.50.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.3.50.dist-info/RECORD,,