v3.2.1 release

Sid Mohan · Sid Mohan · commit cf36dd677770 · 2024-05-27T20:56:44.000-07:00
diff --git a/datafog/__about__.py b/datafog/__about__.py
@@ -1 +1 @@
-__version__ = "3.2.1b3"
+__version__ = "3.2.1"
diff --git a/examples/getting_started.ipynb b/examples/getting_started.ipynb
@@ -47,7 +47,7 @@
     }
    ],
    "source": [
-    "!pip install --upgrade datafog --pre --quiet"
+    "!pip install --upgrade datafog --quiet"
    ]
   },
   {
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 
 def __version__():
-    return "3.2.1b9"
+    return "3.2.1"
 
 
 project_urls = {
diff --git a/tests/beta_pypi_test.ipynb b/tests/beta_pypi_test.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 57,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -19,7 +19,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 58,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -32,7 +32,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 59,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -41,95 +41,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 60,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Obtaining file:///Users/sidmohan/Desktop/datafog_local/datafog-python/datafog-python\n",
-      "  Installing build dependencies ... \u001b[?25ldone\n",
-      "\u001b[?25h  Checking if build backend supports build_editable ... \u001b[?25ldone\n",
-      "\u001b[?25h  Getting requirements to build editable ... \u001b[?25ldone\n",
-      "\u001b[?25h  Preparing editable metadata (pyproject.toml) ... \u001b[?25ldone\n",
-      "\u001b[?25hRequirement already satisfied: pandas in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (2.2.2)\n",
-      "Requirement already satisfied: Requests==2.31.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (2.31.0)\n",
-      "Requirement already satisfied: spacy==3.4.4 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (3.4.4)\n",
-      "Requirement already satisfied: en-spacy-pii-fast==0.0.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (0.0.0)\n",
-      "Requirement already satisfied: pydantic==1.10.15 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (1.10.15)\n",
-      "Requirement already satisfied: Pillow in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (10.3.0)\n",
-      "Requirement already satisfied: sentencepiece in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (0.2.0)\n",
-      "Requirement already satisfied: protobuf in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (4.25.3)\n",
-      "Requirement already satisfied: pytesseract in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (0.3.10)\n",
-      "Requirement already satisfied: aiohttp in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (3.9.5)\n",
-      "Requirement already satisfied: pytest-asyncio in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from datafog==3.2.1b3) (0.23.6)\n",
-      "Requirement already satisfied: typing-extensions>=4.2.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from pydantic==1.10.15->datafog==3.2.1b3) (4.11.0)\n",
-      "Requirement already satisfied: charset-normalizer<4,>=2 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from Requests==2.31.0->datafog==3.2.1b3) (3.3.2)\n",
-      "Requirement already satisfied: idna<4,>=2.5 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from Requests==2.31.0->datafog==3.2.1b3) (3.7)\n",
-      "Requirement already satisfied: urllib3<3,>=1.21.1 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from Requests==2.31.0->datafog==3.2.1b3) (2.2.1)\n",
-      "Requirement already satisfied: certifi>=2017.4.17 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from Requests==2.31.0->datafog==3.2.1b3) (2024.2.2)\n",
-      "Requirement already satisfied: spacy-legacy<3.1.0,>=3.0.10 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (3.0.12)\n",
-      "Requirement already satisfied: spacy-loggers<2.0.0,>=1.0.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (1.0.5)\n",
-      "Requirement already satisfied: murmurhash<1.1.0,>=0.28.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (1.0.10)\n",
-      "Requirement already satisfied: cymem<2.1.0,>=2.0.2 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (2.0.8)\n",
-      "Requirement already satisfied: preshed<3.1.0,>=3.0.2 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (3.0.9)\n",
-      "Requirement already satisfied: thinc<8.2.0,>=8.1.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (8.1.12)\n",
-      "Requirement already satisfied: wasabi<1.1.0,>=0.9.1 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (0.10.1)\n",
-      "Requirement already satisfied: srsly<3.0.0,>=2.4.3 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (2.4.8)\n",
-      "Requirement already satisfied: catalogue<2.1.0,>=2.0.6 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (2.0.10)\n",
-      "Requirement already satisfied: typer<0.8.0,>=0.3.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (0.7.0)\n",
-      "Requirement already satisfied: pathy>=0.3.5 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (0.11.0)\n",
-      "Requirement already satisfied: smart-open<7.0.0,>=5.2.1 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (5.2.1)\n",
-      "Requirement already satisfied: tqdm<5.0.0,>=4.38.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (4.66.4)\n",
-      "Requirement already satisfied: numpy>=1.15.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (1.26.4)\n",
-      "Requirement already satisfied: jinja2 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (3.1.4)\n",
-      "Requirement already satisfied: setuptools in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (58.1.0)\n",
-      "Requirement already satisfied: packaging>=20.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (23.2)\n",
-      "Requirement already satisfied: langcodes<4.0.0,>=3.2.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from spacy==3.4.4->datafog==3.2.1b3) (3.3.0)\n",
-      "Requirement already satisfied: aiosignal>=1.1.2 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from aiohttp->datafog==3.2.1b3) (1.3.1)\n",
-      "Requirement already satisfied: attrs>=17.3.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from aiohttp->datafog==3.2.1b3) (23.2.0)\n",
-      "Requirement already satisfied: frozenlist>=1.1.1 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from aiohttp->datafog==3.2.1b3) (1.4.1)\n",
-      "Requirement already satisfied: multidict<7.0,>=4.5 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from aiohttp->datafog==3.2.1b3) (6.0.5)\n",
-      "Requirement already satisfied: yarl<2.0,>=1.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from aiohttp->datafog==3.2.1b3) (1.9.4)\n",
-      "Requirement already satisfied: python-dateutil>=2.8.2 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from pandas->datafog==3.2.1b3) (2.9.0.post0)\n",
-      "Requirement already satisfied: pytz>=2020.1 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from pandas->datafog==3.2.1b3) (2024.1)\n",
-      "Requirement already satisfied: tzdata>=2022.7 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from pandas->datafog==3.2.1b3) (2024.1)\n",
-      "Requirement already satisfied: pytest<9,>=7.0.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from pytest-asyncio->datafog==3.2.1b3) (8.0.2)\n",
-      "Requirement already satisfied: pathlib-abc==0.1.1 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from pathy>=0.3.5->spacy==3.4.4->datafog==3.2.1b3) (0.1.1)\n",
-      "Requirement already satisfied: iniconfig in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from pytest<9,>=7.0.0->pytest-asyncio->datafog==3.2.1b3) (2.0.0)\n",
-      "Requirement already satisfied: pluggy<2.0,>=1.3.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from pytest<9,>=7.0.0->pytest-asyncio->datafog==3.2.1b3) (1.4.0)\n",
-      "Requirement already satisfied: six>=1.5 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from python-dateutil>=2.8.2->pandas->datafog==3.2.1b3) (1.16.0)\n",
-      "Requirement already satisfied: blis<0.8.0,>=0.7.8 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from thinc<8.2.0,>=8.1.0->spacy==3.4.4->datafog==3.2.1b3) (0.7.11)\n",
-      "Requirement already satisfied: confection<1.0.0,>=0.0.1 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from thinc<8.2.0,>=8.1.0->spacy==3.4.4->datafog==3.2.1b3) (0.1.4)\n",
-      "Requirement already satisfied: click<9.0.0,>=7.1.1 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from typer<0.8.0,>=0.3.0->spacy==3.4.4->datafog==3.2.1b3) (8.1.7)\n",
-      "Requirement already satisfied: MarkupSafe>=2.0 in /Users/sidmohan/.pyenv/versions/3.11.7/envs/2.2.0b1/lib/python3.11/site-packages (from jinja2->spacy==3.4.4->datafog==3.2.1b3) (2.1.5)\n",
-      "Building wheels for collected packages: datafog\n",
-      "  Building editable for datafog (pyproject.toml) ... \u001b[?25ldone\n",
-      "\u001b[?25h  Created wheel for datafog: filename=datafog-3.2.1b3-0.editable-py3-none-any.whl size=6942 sha256=19c91592c093edff7f3ab1c073aa39e545cde656fe889f2b8534be5012121915\n",
-      "  Stored in directory: /private/var/folders/8r/bfx45hqn6lg5cbjnxjt2jdtm0000gn/T/pip-ephem-wheel-cache-ke4aeo6_/wheels/d0/c3/69/badf24afcbfead2b7a600b5b58c7ad0f020fd82029bbcf198e\n",
-      "Successfully built datafog\n",
-      "Installing collected packages: datafog\n",
-      "  Attempting uninstall: datafog\n",
-      "    Found existing installation: datafog 3.2.1b3\n",
-      "    Uninstalling datafog-3.2.1b3:\n",
-      "      Successfully uninstalled datafog-3.2.1b3\n",
-      "Successfully installed datafog-3.2.1b3\n",
-      "\n",
-      "\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m A new release of pip is available: \u001b[0m\u001b[31;49m23.2.1\u001b[0m\u001b[39;49m -> \u001b[0m\u001b[32;49m24.0\u001b[0m\n",
-      "\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m To update, run: \u001b[0m\u001b[32;49mpip install --upgrade pip\u001b[0m\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "\n",
-    "# !pip install --pre --upgrade datafog \n",
-    "!pip install -e ../\n"
+    "!pip install --pre --upgrade datafog -q\n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 61,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -147,7 +69,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 62,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -156,7 +78,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 63,
    "metadata": {},
    "outputs": [
     {
diff --git a/tests/test_image_service.py b/tests/test_image_service.py
@@ -1,62 +1,62 @@
-# # Pytest test cases for the image_service.py module
-# # The test cases are written to test the image_service.py module
-# # The test cases will test the ImageService class
-# # The ImageService class is responsible for downloading images and extracting text from the images
-# # The ImageService class uses the ImageDownloader, DonutProcessor, and PytesseractProcessor classes
-# # The ImageService class has two methods: download_images and ocr_extract
-# # The download_images method is responsible for downloading the images from the given URLs
-# # The ocr_extract method is responsible for extracting the text from the images
-# # The ocr_extract method has two optional parameters: use_donut and use_tesseract
-# # The use_donut parameter is used to select the donut processor for the OCR
-# # The use_tesseract parameter is used to select the pytesseract processor for the OCR
-
-
-# import pytest
-# from PIL import Image
-
-# from datafog.services.image_service import ImageService
-
-# urls = [
-#     "https://www.pdffiller.com/preview/101/35/101035394.png",
-#     "https://www.pdffiller.com/preview/435/972/435972694.png",
-# ]
-
-
-# @pytest.mark.asyncio
-# async def test_download_images():
-#     image_service1 = ImageService()
-#     images = await image_service1.download_images(urls)
-#     assert len(images) == 2
-#     assert all(isinstance(image, Image.Image) for image in images)
-
-
-# @pytest.mark.asyncio
-# async def test_ocr_extract_with_tesseract():
-#     image_service2 = ImageService(use_tesseract=True, use_donut=False)
-#     texts = await image_service2.ocr_extract(urls)
-#     assert isinstance(texts, list)
-#     assert all(isinstance(text, str) for text in texts)
-
-
-# @pytest.mark.asyncio
-# async def test_ocr_extract_with_both():
-#     image_service3 = ImageService(use_tesseract=True, use_donut=True)
-#     with pytest.raises(
-#         ValueError, match="Both OCR processors cannot be selected simultaneously"
-#     ):
-#         await image_service3.ocr_extract(urls)
-
-
-# @pytest.mark.asyncio
-# async def test_ocr_extract_with_donut():
-#     image_service4 = ImageService(use_donut=True, use_tesseract=False)
-#     texts = await image_service4.ocr_extract(urls)
-#     assert isinstance(texts, list)
-#     assert all(isinstance(text, str) for text in texts)
-
-
-# @pytest.mark.asyncio
-# async def test_ocr_extract_no_processor_selected():
-#     image_service5 = ImageService(use_tesseract=False, use_donut=False)
-#     with pytest.raises(ValueError, match="No OCR processor selected"):
-#         await image_service5.ocr_extract(urls)
+# Pytest test cases for the image_service.py module
+# The test cases are written to test the image_service.py module
+# The test cases will test the ImageService class
+# The ImageService class is responsible for downloading images and extracting text from the images
+# The ImageService class uses the ImageDownloader, DonutProcessor, and PytesseractProcessor classes
+# The ImageService class has two methods: download_images and ocr_extract
+# The download_images method is responsible for downloading the images from the given URLs
+# The ocr_extract method is responsible for extracting the text from the images
+# The ocr_extract method has two optional parameters: use_donut and use_tesseract
+# The use_donut parameter is used to select the donut processor for the OCR
+# The use_tesseract parameter is used to select the pytesseract processor for the OCR
+
+
+import pytest
+from PIL import Image
+
+from datafog.services.image_service import ImageService
+
+urls = [
+    "https://www.pdffiller.com/preview/101/35/101035394.png",
+    "https://www.pdffiller.com/preview/435/972/435972694.png",
+]
+
+
+@pytest.mark.asyncio
+async def test_download_images():
+    image_service1 = ImageService()
+    images = await image_service1.download_images(urls)
+    assert len(images) == 2
+    assert all(isinstance(image, Image.Image) for image in images)
+
+
+@pytest.mark.asyncio
+async def test_ocr_extract_with_tesseract():
+    image_service2 = ImageService(use_tesseract=True, use_donut=False)
+    texts = await image_service2.ocr_extract(urls)
+    assert isinstance(texts, list)
+    assert all(isinstance(text, str) for text in texts)
+
+
+@pytest.mark.asyncio
+async def test_ocr_extract_with_both():
+    image_service3 = ImageService(use_tesseract=True, use_donut=True)
+    with pytest.raises(
+        ValueError, match="Both OCR processors cannot be selected simultaneously"
+    ):
+        await image_service3.ocr_extract(urls)
+
+
+@pytest.mark.asyncio
+async def test_ocr_extract_with_donut():
+    image_service4 = ImageService(use_donut=True, use_tesseract=False)
+    texts = await image_service4.ocr_extract(urls)
+    assert isinstance(texts, list)
+    assert all(isinstance(text, str) for text in texts)
+
+
+@pytest.mark.asyncio
+async def test_ocr_extract_no_processor_selected():
+    image_service5 = ImageService(use_tesseract=False, use_donut=False)
+    with pytest.raises(ValueError, match="No OCR processor selected"):
+        await image_service5.ocr_extract(urls)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "3.2.1b3"`
	`1`	`+__version__ = "3.2.1"`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`}`
`48`	`48`	`],`
`49`	`49`	`"source": [`
`50`		`- "!pip install --upgrade datafog --pre --quiet"`
	`50`	`+ "!pip install --upgrade datafog --quiet"`
`51`	`51`	`]`
`52`	`52`	`},`
`53`	`53`	`{`