diff --git a/owocr/py_lens/aim_communication_pb2.py b/owocr/lens_protos/aim_communication_pb2.py similarity index 100% rename from owocr/py_lens/aim_communication_pb2.py rename to owocr/lens_protos/aim_communication_pb2.py diff --git a/owocr/py_lens/aim_query_pb2.py b/owocr/lens_protos/aim_query_pb2.py similarity index 100% rename from owocr/py_lens/aim_query_pb2.py rename to owocr/lens_protos/aim_query_pb2.py diff --git a/owocr/py_lens/lens_overlay_client_context_pb2.py b/owocr/lens_protos/lens_overlay_client_context_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_client_context_pb2.py rename to owocr/lens_protos/lens_overlay_client_context_pb2.py diff --git a/owocr/py_lens/lens_overlay_client_logs_pb2.py b/owocr/lens_protos/lens_overlay_client_logs_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_client_logs_pb2.py rename to owocr/lens_protos/lens_overlay_client_logs_pb2.py diff --git a/owocr/py_lens/lens_overlay_client_platform_pb2.py b/owocr/lens_protos/lens_overlay_client_platform_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_client_platform_pb2.py rename to owocr/lens_protos/lens_overlay_client_platform_pb2.py diff --git a/owocr/py_lens/lens_overlay_cluster_info_pb2.py b/owocr/lens_protos/lens_overlay_cluster_info_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_cluster_info_pb2.py rename to owocr/lens_protos/lens_overlay_cluster_info_pb2.py diff --git a/owocr/py_lens/lens_overlay_contextual_inputs_pb2.py b/owocr/lens_protos/lens_overlay_contextual_inputs_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_contextual_inputs_pb2.py rename to owocr/lens_protos/lens_overlay_contextual_inputs_pb2.py diff --git a/owocr/py_lens/lens_overlay_deep_gleam_data_pb2.py b/owocr/lens_protos/lens_overlay_deep_gleam_data_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_deep_gleam_data_pb2.py rename to owocr/lens_protos/lens_overlay_deep_gleam_data_pb2.py diff --git a/owocr/py_lens/lens_overlay_document_pb2.py b/owocr/lens_protos/lens_overlay_document_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_document_pb2.py rename to owocr/lens_protos/lens_overlay_document_pb2.py diff --git a/owocr/py_lens/lens_overlay_filters_pb2.py b/owocr/lens_protos/lens_overlay_filters_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_filters_pb2.py rename to owocr/lens_protos/lens_overlay_filters_pb2.py diff --git a/owocr/py_lens/lens_overlay_geometry_pb2.py b/owocr/lens_protos/lens_overlay_geometry_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_geometry_pb2.py rename to owocr/lens_protos/lens_overlay_geometry_pb2.py diff --git a/owocr/py_lens/lens_overlay_image_crop_pb2.py b/owocr/lens_protos/lens_overlay_image_crop_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_image_crop_pb2.py rename to owocr/lens_protos/lens_overlay_image_crop_pb2.py diff --git a/owocr/py_lens/lens_overlay_image_data_pb2.py b/owocr/lens_protos/lens_overlay_image_data_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_image_data_pb2.py rename to owocr/lens_protos/lens_overlay_image_data_pb2.py diff --git a/owocr/py_lens/lens_overlay_interaction_request_metadata_pb2.py b/owocr/lens_protos/lens_overlay_interaction_request_metadata_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_interaction_request_metadata_pb2.py rename to owocr/lens_protos/lens_overlay_interaction_request_metadata_pb2.py diff --git a/owocr/py_lens/lens_overlay_knowledge_intent_query_pb2.py b/owocr/lens_protos/lens_overlay_knowledge_intent_query_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_knowledge_intent_query_pb2.py rename to owocr/lens_protos/lens_overlay_knowledge_intent_query_pb2.py diff --git a/owocr/py_lens/lens_overlay_knowledge_query_pb2.py b/owocr/lens_protos/lens_overlay_knowledge_query_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_knowledge_query_pb2.py rename to owocr/lens_protos/lens_overlay_knowledge_query_pb2.py diff --git a/owocr/py_lens/lens_overlay_math_solver_query_pb2.py b/owocr/lens_protos/lens_overlay_math_solver_query_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_math_solver_query_pb2.py rename to owocr/lens_protos/lens_overlay_math_solver_query_pb2.py diff --git a/owocr/py_lens/lens_overlay_message_set_pb2.py b/owocr/lens_protos/lens_overlay_message_set_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_message_set_pb2.py rename to owocr/lens_protos/lens_overlay_message_set_pb2.py diff --git a/owocr/py_lens/lens_overlay_overlay_object_pb2.py b/owocr/lens_protos/lens_overlay_overlay_object_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_overlay_object_pb2.py rename to owocr/lens_protos/lens_overlay_overlay_object_pb2.py diff --git a/owocr/py_lens/lens_overlay_payload_pb2.py b/owocr/lens_protos/lens_overlay_payload_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_payload_pb2.py rename to owocr/lens_protos/lens_overlay_payload_pb2.py diff --git a/owocr/py_lens/lens_overlay_phase_latencies_metadata_pb2.py b/owocr/lens_protos/lens_overlay_phase_latencies_metadata_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_phase_latencies_metadata_pb2.py rename to owocr/lens_protos/lens_overlay_phase_latencies_metadata_pb2.py diff --git a/owocr/py_lens/lens_overlay_platform_pb2.py b/owocr/lens_protos/lens_overlay_platform_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_platform_pb2.py rename to owocr/lens_protos/lens_overlay_platform_pb2.py diff --git a/owocr/py_lens/lens_overlay_polygon_pb2.py b/owocr/lens_protos/lens_overlay_polygon_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_polygon_pb2.py rename to owocr/lens_protos/lens_overlay_polygon_pb2.py diff --git a/owocr/py_lens/lens_overlay_request_id_pb2.py b/owocr/lens_protos/lens_overlay_request_id_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_request_id_pb2.py rename to owocr/lens_protos/lens_overlay_request_id_pb2.py diff --git a/owocr/py_lens/lens_overlay_request_type_pb2.py b/owocr/lens_protos/lens_overlay_request_type_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_request_type_pb2.py rename to owocr/lens_protos/lens_overlay_request_type_pb2.py diff --git a/owocr/py_lens/lens_overlay_routing_info_pb2.py b/owocr/lens_protos/lens_overlay_routing_info_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_routing_info_pb2.py rename to owocr/lens_protos/lens_overlay_routing_info_pb2.py diff --git a/owocr/py_lens/lens_overlay_selection_type_pb2.py b/owocr/lens_protos/lens_overlay_selection_type_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_selection_type_pb2.py rename to owocr/lens_protos/lens_overlay_selection_type_pb2.py diff --git a/owocr/py_lens/lens_overlay_server_pb2.py b/owocr/lens_protos/lens_overlay_server_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_server_pb2.py rename to owocr/lens_protos/lens_overlay_server_pb2.py diff --git a/owocr/py_lens/lens_overlay_service_deps_pb2.py b/owocr/lens_protos/lens_overlay_service_deps_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_service_deps_pb2.py rename to owocr/lens_protos/lens_overlay_service_deps_pb2.py diff --git a/owocr/py_lens/lens_overlay_stickiness_signals_pb2.py b/owocr/lens_protos/lens_overlay_stickiness_signals_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_stickiness_signals_pb2.py rename to owocr/lens_protos/lens_overlay_stickiness_signals_pb2.py diff --git a/owocr/py_lens/lens_overlay_surface_pb2.py b/owocr/lens_protos/lens_overlay_surface_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_surface_pb2.py rename to owocr/lens_protos/lens_overlay_surface_pb2.py diff --git a/owocr/py_lens/lens_overlay_text_pb2.py b/owocr/lens_protos/lens_overlay_text_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_text_pb2.py rename to owocr/lens_protos/lens_overlay_text_pb2.py diff --git a/owocr/py_lens/lens_overlay_text_query_pb2.py b/owocr/lens_protos/lens_overlay_text_query_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_text_query_pb2.py rename to owocr/lens_protos/lens_overlay_text_query_pb2.py diff --git a/owocr/py_lens/lens_overlay_translate_stickiness_signals_pb2.py b/owocr/lens_protos/lens_overlay_translate_stickiness_signals_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_translate_stickiness_signals_pb2.py rename to owocr/lens_protos/lens_overlay_translate_stickiness_signals_pb2.py diff --git a/owocr/py_lens/lens_overlay_video_context_input_params_pb2.py b/owocr/lens_protos/lens_overlay_video_context_input_params_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_video_context_input_params_pb2.py rename to owocr/lens_protos/lens_overlay_video_context_input_params_pb2.py diff --git a/owocr/py_lens/lens_overlay_video_params_pb2.py b/owocr/lens_protos/lens_overlay_video_params_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_video_params_pb2.py rename to owocr/lens_protos/lens_overlay_video_params_pb2.py diff --git a/owocr/py_lens/lens_overlay_visual_input_type_pb2.py b/owocr/lens_protos/lens_overlay_visual_input_type_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_visual_input_type_pb2.py rename to owocr/lens_protos/lens_overlay_visual_input_type_pb2.py diff --git a/owocr/py_lens/lens_overlay_visual_search_interaction_data_pb2.py b/owocr/lens_protos/lens_overlay_visual_search_interaction_data_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_visual_search_interaction_data_pb2.py rename to owocr/lens_protos/lens_overlay_visual_search_interaction_data_pb2.py diff --git a/owocr/py_lens/lens_overlay_visual_search_interaction_log_data_pb2.py b/owocr/lens_protos/lens_overlay_visual_search_interaction_log_data_pb2.py similarity index 100% rename from owocr/py_lens/lens_overlay_visual_search_interaction_log_data_pb2.py rename to owocr/lens_protos/lens_overlay_visual_search_interaction_log_data_pb2.py diff --git a/owocr/ocr.py b/owocr/ocr.py index 19826f5..4166cc4 100644 --- a/owocr/ocr.py +++ b/owocr/ocr.py @@ -79,10 +79,10 @@ except ImportError: try: from google.protobuf.json_format import MessageToDict - from .py_lens.lens_overlay_server_pb2 import LensOverlayServerRequest, LensOverlayServerResponse - from .py_lens.lens_overlay_platform_pb2 import PLATFORM_WEB - from .py_lens.lens_overlay_surface_pb2 import SURFACE_CHROMIUM - from .py_lens.lens_overlay_filters_pb2 import AUTO_FILTER + from .lens_protos.lens_overlay_server_pb2 import LensOverlayServerRequest, LensOverlayServerResponse + from .lens_protos.lens_overlay_platform_pb2 import PLATFORM_WEB + from .lens_protos.lens_overlay_surface_pb2 import SURFACE_CHROMIUM + from .lens_protos.lens_overlay_filters_pb2 import AUTO_FILTER import random except ImportError: pass @@ -853,7 +853,7 @@ class GoogleLens: lines.append(line) p_bbox = p.get('geometry', {}).get('bounding_box', {}) - writing_direction=p.get('writing_direction') + writing_direction = p.get('writing_direction') if writing_direction: writing_direction = writing_direction.replace('WRITING_DIRECTION_', '')