Commit 99459406 authored by dmMaze's avatar dmMaze
Browse files

rename lens_api_ocr to google_lens, fix #537

parent d271e8b7
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ from copy import deepcopy
from collections import OrderedDict

from utils.logger import logger as LOGGER
from utils import shared


GPUINTENSIVE_SET = {'cuda', 'mps'}

@@ -144,6 +146,11 @@ class BaseModule:
    def __del__(self):
        self.unload_model()

    @property
    def debug_mode(self):
        return shared.DEBUG


os.environ['PYTORCH_ENABLE_MPS_FALLBACK'] = '1'
import torch

+5 −13
Original line number Diff line number Diff line
@@ -123,15 +123,10 @@ class LensAPI:
        }


@register_OCR('lens_api_ocr')
@register_OCR('google_lens')
class OCRLensAPI(OCRBase):
    params = {
        "delay": 1.0,
        'debug': {
            'type': 'checkbox',
            'value': False,
            'description': 'Enable debug logging'
        },
        'newline_handling': {
            'type': 'selector',
            'options': [
@@ -151,19 +146,15 @@ class OCRLensAPI(OCRBase):
    
    @property
    def request_delay(self):
        return float(self.params['delay']['value'])
    
    @property
    def debug_mode(self):
        return bool(self.params['debug']['value'])
        return self.get_param_value('delay')
    
    @property
    def newline_handling(self):
        return self.params['newline_handling']['value']
        return self.get_param_value('newline_handling')
    
    @property
    def no_uppercase(self):
        return bool(self.params['no_uppercase']['value'])
        return self.get_param_value('no_uppercase')

    def __init__(self, **params) -> None:
        super().__init__(**params)
@@ -270,6 +261,7 @@ class OCRLensAPI(OCRBase):
        time_since_last_request = current_time - self.last_request_time
        if self.debug_mode:
            self.logger.info(f'Time since last request: {time_since_last_request} seconds')

        if time_since_last_request < self.request_delay:
            sleep_time = self.request_delay - time_since_last_request
            if self.debug_mode:
+2 −0
Original line number Diff line number Diff line
@@ -547,6 +547,8 @@ def merge_config_module_params(config_params: Dict, module_keys: List, get_modul
                                cparam['value'] = mv
                    else:
                        if type(cparam) != type(mparam):
                            if not isinstance(mparam, dict) and isinstance(cparam, dict):
                                cparam = cparam['value']
                            try:
                                cfg_param[mk] = type(mparam)(cparam)
                            except ValueError: