GameSentenceMiner 2.15.1__tar.gz → 2.15.3__tar.gz

{gamesentenceminer-2.15.1 → gamesentenceminer-2.15.3}/GameSentenceMiner/obs.py

@@ -506,9 +506,16 @@ def set_fit_to_screen_for_scene_items(scene_name: str):
             
             source_width = scene_item_transform.get('sourceWidth', None)
             source_height = scene_item_transform.get('sourceHeight', None)
-            
+
             aspect_ratio_different = False
-            if source_width and source_height:
+            already_cropped = any([
+                scene_item_transform.get('cropLeft', 0) != 0,
+                scene_item_transform.get('cropRight', 0) != 0,
+                scene_item_transform.get('cropTop', 0) != 0,
+                scene_item_transform.get('cropBottom', 0) != 0,
+            ])
+            
+            if source_width and source_height and not already_cropped:
                 source_aspect_ratio = source_width / source_height
                 canvas_aspect_ratio = canvas_width / canvas_height
                 # Check if aspect ratio is different and if it's a standard aspect ratio
@@ -541,11 +548,15 @@ def set_fit_to_screen_for_scene_items(scene_name: str):
                 'boundsHeight': canvas_height,
                 'positionX': 0,
                 'positionY': 0,
-                'cropLeft': 0 if not aspect_ratio_different or canvas_width > source_width else (source_width - canvas_width) // 2,
-                'cropRight': 0 if not aspect_ratio_different or canvas_width > source_width else (source_width - canvas_width) // 2,
-                'cropTop': 0 if not aspect_ratio_different or canvas_height > source_height else (source_height - canvas_height) // 2,
-                'cropBottom': 0 if not aspect_ratio_different or canvas_height > source_height else (source_height - canvas_height) // 2,
             }
+            
+            if not already_cropped:
+                fit_to_screen_transform.update({
+                    'cropLeft': 0 if not aspect_ratio_different or canvas_width > source_width else (source_width - canvas_width) // 2,
+                    'cropRight': 0 if not aspect_ratio_different or canvas_width > source_width else (source_width - canvas_width) // 2,
+                    'cropTop': 0 if not aspect_ratio_different or canvas_height > source_height else (source_height - canvas_height) // 2,
+                    'cropBottom': 0 if not aspect_ratio_different or canvas_height > source_height else (source_height - canvas_height) // 2,
+                })
 
             try:
                 client.set_scene_item_transform(

{gamesentenceminer-2.15.1 → gamesentenceminer-2.15.3}/GameSentenceMiner/owocr/owocr/ocr.py

@@ -1014,7 +1014,6 @@ class OneOCR:
                     res = ocr_resp['text']
                     
                 if multiple_crop_coords:
-                    logger.info(f"Getting multiple crop coords for {len(filtered_lines)} lines")
                     for line in filtered_lines:
                         crop_coords_list.append(
                             (line['bounding_rect']['x1'] - 5, line['bounding_rect']['y1'] - 5,
@@ -1434,13 +1433,10 @@ class localLLMOCR:
             self.keep_warm = config.get('keep_warm', True)
             self.custom_prompt = config.get('prompt', None)
             self.available = True
-            if any(x in self.api_url for x in ['localhost', '127.0.0.1']):
-                if not self.check_connection(self.api_url):
-                    logger.warning('Local LLM OCR API is not reachable')
-                    return
             self.client = openai.OpenAI(
                 base_url=self.api_url.replace('/v1/chat/completions', '/v1'),
-                api_key=self.api_key
+                api_key=self.api_key,
+                timeout=3
             )
             if self.client.models.retrieve(self.model):
                 self.model = self.model
@@ -1450,24 +1446,6 @@ class localLLMOCR:
                 self.keep_llm_hot_thread.start()
         except Exception as e:
             logger.warning(f'Error initializing Local LLM OCR, Local LLM OCR will not work!')
-            
-    def check_connection(self, url, port=None):
-        import http.client
-        conn = http.client.HTTPConnection(url, port or 1234, timeout=0.1)
-        try:
-            conn.request("GET", "/v1/models")
-            response = conn.getresponse()
-            if response.status == 200:
-                logger.info('Local LLM OCR API is reachable')
-                return True
-            else:
-                logger.warning('Local LLM OCR API is not reachable')
-                return False
-        except Exception as e:
-            logger.warning(f'Error connecting to Local LLM OCR API: {e}')
-            return False
-        finally:
-            conn.close()
         
     def keep_llm_warm(self):
         def ocr_blank_black_image():

{gamesentenceminer-2.15.1 → gamesentenceminer-2.15.3}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.15.1
+Version: 2.15.3
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.15.1 → gamesentenceminer-2.15.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.15.1
+Version: 2.15.3
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.15.1 → gamesentenceminer-2.15.3}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.15.1"
+version = "2.15.3"
 description = "A tool for mining sentences from games. Update: Overlay?"
 readme = "README.md"
 requires-python = ">=3.10"