Fix file utils and add tests (#68)

* Fix file-utils for gcv

* Add file-utils tests

* fix ci

* fix dep

* separately install effdet

* Add additional extra_requires

Author: lolipopshock

.github/workflows/ci.yml

@@ -21,7 +21,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install .
-        pip install 'git+https://github.com/facebookresearch/[email protected]#egg=detectron2' 
         
     - name: Lint with flake8
       run: |
@@ -30,9 +29,16 @@ jobs:
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --ignore F821
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-        
+    
+    - name: Test Dependency Support 
+      run: |
+        # Install additional requirements when running tests
+        pip install pytest
+        pytest tests_deps
+
     - name: Test with pytest
       run: |
         # Install additional requirements when running tests
+        pip install .[effdet]
         pip install -r dev-requirements.txt
-        pytest
+        pytest tests

setup.py

@@ -24,7 +24,6 @@
         "pandas",
         "pillow",
         "pyyaml>=5.1",
-        "torchvision",
         "iopath",
       ],
       extras_require={
@@ -34,7 +33,14 @@
         ], 
         "effdet": [
           "torch",
+          "torchvision",
           "effdet"
+        ],
+        "detectron2": [
+          "detectron2@git+https://github.com/facebookresearch/[email protected]#egg=detectron2"
+        ],
+        "paddledetection": [
+          "paddlepaddle==2.1.0"
         ]
       },
       include_package_data=True

src/layoutparser/file_utils.py

@@ -62,13 +62,16 @@
 except importlib_metadata.PackageNotFoundError:
     _pytesseract_available = False
 
-_gcv_available = importlib.util.find_spec("google.cloud.vision") is not None
 try:
-    _gcv_version = importlib_metadata.version(
-        "google-cloud-vision"
-    )  # This is slightly different
-    logger.debug(f"Google Cloud Vision Utils version {_gcv_version} available.")
-except importlib_metadata.PackageNotFoundError:
+    _gcv_available = importlib.util.find_spec("google.cloud.vision") is not None
+    try:
+        _gcv_version = importlib_metadata.version(
+            "google-cloud-vision"
+        )  # This is slightly different
+        logger.debug(f"Google Cloud Vision Utils version {_gcv_version} available.")
+    except importlib_metadata.PackageNotFoundError:
+        _gcv_available = False
+except ModuleNotFoundError:
     _gcv_available = False
 
 
@@ -142,7 +145,7 @@ def is_gcv_available():
         ("torch", (is_torch_available, PYTORCH_IMPORT_ERROR)),
         ("detectron2", (is_detectron2_available, DETECTRON2_IMPORT_ERROR)),
         ("paddle", (is_paddle_available, PADDLE_IMPORT_ERROR)),
-        ("effdet", (is_effdet_available, )),
+        ("effdet", (is_effdet_available, EFFDET_IMPORT_ERROR)),
         ("pytesseract", (is_pytesseract_available, PYTESSERACT_IMPORT_ERROR)),
         ("google-cloud-vision", (is_gcv_available, GCV_IMPORT_ERROR)),
     ]

tests_deps/test_file_utils.py

@@ -0,0 +1,12 @@
+import pytest
+
+from layoutparser import requires_backends
+
+def test_when_backends_are_not_loaded():
+
+    # When all the backeds are not installed, it should 
+    # elicit only ImportErrors
+
+    for backend_name in ["torch", "detectron2", "paddle", "effdet", "pytesseract", "google-cloud-vision"]:
+        with pytest.raises(ImportError):
+            requires_backends("a", backend_name)