Merge pull request #254 Fix check module exists

Author: rekby

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Fixed bug with ModuleNotFoundError while import ydb
+
 ## 3.1.0 ##
 COMPLETE CHANGELOG FROM v2:
 * Add api for topic service

ydb/_grpc/common/__init__.py

@@ -1,16 +1,16 @@
 import sys
-import importlib.util
 
 import google.protobuf
 from packaging.version import Version
+from ... import _utilities
 
 # generated files are incompatible between 3 and 4 protobuf versions
 # import right generated version for current protobuf lib
 # sdk code must always import from ydb._grpc.common
 protobuf_version = Version(google.protobuf.__version__)
 
 # for compatible with arcadia
-if importlib.util.find_spec("ydb.public.api"):
+if _utilities.check_module_exists("ydb.public.api"):
     from ydb.public.api.grpc import *  # noqa
 
     sys.modules["ydb._grpc.common"] = sys.modules["ydb.public.api.grpc"]

ydb/_utilities.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import importlib.util
 import threading
 import codecs
 from concurrent import futures
@@ -76,6 +77,15 @@ def decorator(*args, **kwargs):
     return decorator
 
 
+def check_module_exists(path: str) -> bool:
+    try:
+        if importlib.util.find_spec(path):
+            return True
+    except ModuleNotFoundError:
+        pass
+    return False
+
+
 def get_query_hash(yql_text):
     try:
         return hashlib.sha256(str(yql_text, "utf-8").encode("utf-8")).hexdigest()

ydb/_utilities_test.py

@@ -0,0 +1,11 @@
+import pytest
+
+from ydb._utilities import check_module_exists
+
+
+@pytest.mark.parametrize(
+    "path,result",
+    [("sys", True), ("ydb", True), ("ydb.some.module.unexisted.test", False)],
+)
+def test_check_module_exists(path, result):
+    assert check_module_exists(path) == result