decimer 2.6.0__tar.gz → 2.7.0__tar.gz

{decimer-2.6.0 → decimer-2.7.0}/DECIMER/DECIMER_EfficinetNetV2_Transfomer_Trainer.py

@@ -250,7 +250,7 @@ def prepare_for_training(lr_config, encoder_config, transformer_config, verbose=
             transformer_config["d_model"], lr_config["warm_steps"]
         )
 
-        # Instiate an optimizer
+        # Instantiate an optimizer
         optimizer = tf.keras.optimizers.Adam(
             lr_scheduler, beta_1=0.9, beta_2=0.98, epsilon=1e-9
         )
@@ -323,7 +323,7 @@ if ckpt_manager.latest_checkpoint:
     start_epoch = int(ckpt_manager.latest_checkpoint.split("-")[-1])
 
 
-# Main training step fucntion
+# Main training step function
 def train_step(image_batch, selfies_batch):
     """Main training step function.
 
@@ -376,7 +376,7 @@ def dist_train_step(image_batch, selfies_batch):
 
 
 """
-# Main validation step fucntion
+# Main validation step function
 def validation_step(image_batch, selfies_batch):
 
     selfies_batch_input = selfies_batch[:, :-1]

{decimer-2.6.0 → decimer-2.7.0}/DECIMER/Predictor_usingCheckpoints.py

@@ -45,7 +45,7 @@ tokenizer = pickle.load(
 
 max_length = 302
 
-# Image partameters
+# Image parameters
 IMG_EMB_DIM = (16, 16, 512)
 IMG_EMB_DIM = (IMG_EMB_DIM[0] * IMG_EMB_DIM[1], IMG_EMB_DIM[2])
 IMG_SHAPE = (512, 512, 3)

{decimer-2.6.0 → decimer-2.7.0}/DECIMER/Repack_model.py

@@ -140,7 +140,7 @@ class DECIMER_Predictor(tf.Module):
     It loads the saved checkpoint and the necessary tokenizers. The
     inference begins with the start token (<start>) and ends when the
     end token(<end>) is met. This class can only work with tf.Tensor
-    objects. The strings shoul gets transformed into np.arrays before
+    objects. The strings should get transformed into np.arrays before
     feeding them into this class.
     """
 
@@ -150,7 +150,7 @@ class DECIMER_Predictor(tf.Module):
 
         Args:
             encoder (tf.keras.model):  The encoder model
-            tokenizer (tf.keras.tokenizer): Output tokenizer, defines which charater is assigned to what token
+            tokenizer (tf.keras.tokenizer): Output tokenizer, defines which character is assigned to what token
             transformer (tf.keras.model):  The transformer model
             max_length (int): Maximum length of a string which can get predicted
         """
@@ -160,7 +160,7 @@ class DECIMER_Predictor(tf.Module):
         self.max_length = max_length
 
     def __call__(self, Decoded_image):
-        """This fuction takes in the Decoded image as input and makes the
+        """This function takes in the Decoded image as input and makes the
         predicted list of tokens and return the tokens as tf.Tensor array.
         Before feeding the input array we must define start and the end tokens.
 
@@ -225,7 +225,7 @@ class ExportDECIMERPredictor(tf.Module):
 
     @tf.function
     def __call__(self, Decoded_Image):
-        """This fucntion calls the __call__function from the translator class.
+        """This function calls the __call__function from the translator class.
         In the tf.function only the output sentence is returned. Thanks to the
         non-strict execution in tf.function any unnecessary values are never
         computed.

{decimer-2.6.0 → decimer-2.7.0}/DECIMER/Utils/Create_image_tokenizer.py

@@ -70,7 +70,7 @@ def data_loader(Smiles_Path):
     all_img_name = []
 
     for line in smiles.split("\n"):
-        # Split the ID and SMILES to seperate tokens
+        # Split the ID and SMILES to separate tokens
         tokens = line.split(",")
 
         image_id = str(tokens[0]) + ".png"

{decimer-2.6.0 → decimer-2.7.0}/DECIMER/__init__.py

@@ -1,29 +1,29 @@
-# -*- coding: utf-8 -*-
-"""DECIMER V2.6.0 Python Package. ============================
-
-This repository contains DECIMER-V2,Deep lEarning for Chemical ImagE Recognition) project
-was launched to address the OCSR problem with the latest computational intelligence methods
-to provide an automated open-source software solution.
-
-
-Typical usage example:
-
-from decimer import predict_SMILES
-
-# Chemical depiction to SMILES translation
-image_path = "path/to/imagefile"
-SMILES = predict_SMILES(image_path)
-print(SMILES)
-
-For comments, bug reports or feature ideas,
-please raise a issue on the Github repository.
-"""
-
-__version__ = "2.6.0"
-
-__all__ = [
-    "DECIMER",
-]
-
-
-from .decimer import predict_SMILES
+# -*- coding: utf-8 -*-
+"""DECIMER V2.6.0 Python Package. ============================
+
+This repository contains DECIMER-V2,Deep lEarning for Chemical ImagE Recognition) project
+was launched to address the OCSR problem with the latest computational intelligence methods
+to provide an automated open-source software solution.
+
+
+Typical usage example:
+
+from decimer import predict_SMILES
+
+# Chemical depiction to SMILES translation
+image_path = "path/to/imagefile"
+SMILES = predict_SMILES(image_path)
+print(SMILES)
+
+For comments, bug reports or feature ideas,
+please raise a issue on the Github repository.
+"""
+
+__version__ = "2.6.0"
+
+__all__ = [
+    "DECIMER",
+]
+
+
+from .decimer import predict_SMILES

{decimer-2.6.0 → decimer-2.7.0}/DECIMER/config.py

@@ -232,7 +232,7 @@ class Config:
         defined configurations.
 
         Args:
-            image_embedding_dim (int): Embedding dimention of the input image
+            image_embedding_dim (int): Embedding dimension of the input image
             preprocessing_fn (method): Efficient Net preprocessing function for input image
             backbone_fn (method): Calls Efficient-Net V2 as backbone for encoder
             image_shape (int): Shape of the input image
@@ -267,7 +267,7 @@ class Config:
             n_transformer_layers (int): Number of layers present in the transformer model
             transformer_d_dff (int): Transformer feed forward upwards projection size
             transformer_n_heads (int): Number of heads present in the transformer model
-            image_embedding_dim (int): Total number of dimension the image gets embeddeded
+            image_embedding_dim (int): Total number of dimension the image gets embedded
             dropout_rate (float, optional): Fraction of the input units to drop. Defaults to 0.1.
         """
         self.transformer_config = dict(
@@ -330,7 +330,7 @@ def prepare_models(encoder_config, transformer_config, replica_batch_size, verbo
         [type]: Optimizer, Encoder model and the Transformer
     """
 
-    # Instiate an optimizer
+    # Instantiate an optimizer
     optimizer = tf.keras.optimizers.Adam(learning_rate=0.00051)
 
     # Instantiate the encoder model

{decimer-2.6.0 → decimer-2.7.0}/DECIMER/decimer.py

@@ -71,7 +71,7 @@ tokenizer, DECIMER_V2, DECIMER_Hand_drawn = get_models(model_urls)
 
 
 def detokenize_output(predicted_array: int) -> str:
-    """This function takes the predited tokens from the DECIMER model and
+    """This function takes the predicted tokens from the DECIMER model and
     returns the decoded SMILES string.
 
     Args:
@@ -117,7 +117,7 @@ def detokenize_output_add_confidence(
     decoded_prediction_with_confidence = list(
         [(utils.decoder(tok), conf) for tok, conf in prediction_with_confidence_]
     )
-    decoded_prediction_with_confidence.append(prediction_with_confidence_[-1])
+
     return decoded_prediction_with_confidence
 
 

{decimer-2.6.0 → decimer-2.7.0}/DECIMER/efficientnetv2/effnetv2_model.py

@@ -180,7 +180,7 @@ class MBConvBlock(tf.keras.layers.Layer):
 
         self.endpoints = None
 
-        # Builds the block accordings to arguments.
+        # Builds the block according to arguments.
         self._build()
 
     @property

{decimer-2.6.0 → decimer-2.7.0}/DECIMER/utils.py

@@ -76,13 +76,17 @@ def ensure_models(default_path: str, model_urls: dict) -> dict:
         dict: A dictionary containing model names as keys and their local paths as values
     """
     model_paths = {}
-
+    # Store st_size of each model
+    model_sizes = {
+        "DECIMER": 28080309,
+        "DECIMER_HandDrawn": 28080328,
+    }
     for model_name, model_url in model_urls.items():
         model_path = os.path.join(default_path, f"{model_name}_model")
-        if (
-            os.path.exists(model_path)
-            and os.stat(os.path.join(model_path, "saved_model.pb")).st_size != 28080309
-        ):
+        if os.path.exists(model_path) and os.stat(
+            os.path.join(model_path, "saved_model.pb")
+        ).st_size != model_sizes.get(model_name):
+            print(f"Working with model {model_name}")
             shutil.rmtree(model_path)
             config.download_trained_weights(model_url, default_path)
         elif not os.path.exists(model_path):
@@ -90,5 +94,4 @@ def ensure_models(default_path: str, model_urls: dict) -> dict:
 
         # Store the model path
         model_paths[model_name] = model_path
-
     return model_paths

{decimer-2.6.0/decimer.egg-info → decimer-2.7.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: decimer
-Version: 2.6.0
-Summary: DECIMER 2.4.0: Deep Learning for Chemical Image Recognition using Efficient-Net V2 + Transformer
+Version: 2.7.0
+Summary: DECIMER 2.6.0: Deep Learning for Chemical Image Recognition using Efficient-Net V2 + Transformer
 Home-page: https://github.com/Kohulan/DECIMER-Image_Transformer
 Author: Kohulan Rajan
 Author-email: kohulan.rajan@uni-jena.de
@@ -111,7 +111,7 @@ print(SMILES)
 - This project is licensed under the MIT License - see the [LICENSE](https://raw.githubusercontent.com/Kohulan/DECIMER-Image_Transformer/master/LICENSE?token=AHKLIF3EULMCUKCFUHIPBMDARSMDO) file for details
 
 ## Citation
-- Rajan K, Brinkhaus HO, Agea MI, Zielesny A, Steinbeck C (2023) DECIMER.ai - An open platform for automated optical chemical structure identification, segmentation and recognition in scientific publications. ChemRxiv. doi: https://10.26434/chemrxiv-2023-xhcx9
+- Rajan K, Brinkhaus HO, Agea MI, Zielesny A, Steinbeck C DECIMER.ai - An open platform for automated optical chemical structure identification, segmentation and recognition in scientific publications. Nat. Commun. 14, 5045 (2023). https://doi.org/10.1038/s41467-023-40782-0
 - Rajan, K., Zielesny, A. & Steinbeck, C. DECIMER 1.0: deep learning for chemical image recognition using transformers. J Cheminform 13, 61 (2021). https://doi.org/10.1186/s13321-021-00538-8
 
 ## References

{decimer-2.6.0 → decimer-2.7.0}/README.md

@@ -87,7 +87,7 @@ print(SMILES)
 - This project is licensed under the MIT License - see the [LICENSE](https://raw.githubusercontent.com/Kohulan/DECIMER-Image_Transformer/master/LICENSE?token=AHKLIF3EULMCUKCFUHIPBMDARSMDO) file for details
 
 ## Citation
-- Rajan K, Brinkhaus HO, Agea MI, Zielesny A, Steinbeck C (2023) DECIMER.ai - An open platform for automated optical chemical structure identification, segmentation and recognition in scientific publications. ChemRxiv. doi: https://10.26434/chemrxiv-2023-xhcx9
+- Rajan K, Brinkhaus HO, Agea MI, Zielesny A, Steinbeck C DECIMER.ai - An open platform for automated optical chemical structure identification, segmentation and recognition in scientific publications. Nat. Commun. 14, 5045 (2023). https://doi.org/10.1038/s41467-023-40782-0
 - Rajan, K., Zielesny, A. & Steinbeck, C. DECIMER 1.0: deep learning for chemical image recognition using transformers. J Cheminform 13, 61 (2021). https://doi.org/10.1186/s13321-021-00538-8
 
 ## References

{decimer-2.6.0 → decimer-2.7.0/decimer.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: decimer
-Version: 2.6.0
-Summary: DECIMER 2.4.0: Deep Learning for Chemical Image Recognition using Efficient-Net V2 + Transformer
+Version: 2.7.0
+Summary: DECIMER 2.6.0: Deep Learning for Chemical Image Recognition using Efficient-Net V2 + Transformer
 Home-page: https://github.com/Kohulan/DECIMER-Image_Transformer
 Author: Kohulan Rajan
 Author-email: kohulan.rajan@uni-jena.de
@@ -111,7 +111,7 @@ print(SMILES)
 - This project is licensed under the MIT License - see the [LICENSE](https://raw.githubusercontent.com/Kohulan/DECIMER-Image_Transformer/master/LICENSE?token=AHKLIF3EULMCUKCFUHIPBMDARSMDO) file for details
 
 ## Citation
-- Rajan K, Brinkhaus HO, Agea MI, Zielesny A, Steinbeck C (2023) DECIMER.ai - An open platform for automated optical chemical structure identification, segmentation and recognition in scientific publications. ChemRxiv. doi: https://10.26434/chemrxiv-2023-xhcx9
+- Rajan K, Brinkhaus HO, Agea MI, Zielesny A, Steinbeck C DECIMER.ai - An open platform for automated optical chemical structure identification, segmentation and recognition in scientific publications. Nat. Commun. 14, 5045 (2023). https://doi.org/10.1038/s41467-023-40782-0
 - Rajan, K., Zielesny, A. & Steinbeck, C. DECIMER 1.0: deep learning for chemical image recognition using transformers. J Cheminform 13, 61 (2021). https://doi.org/10.1186/s13321-021-00538-8
 
 ## References

{decimer-2.6.0 → decimer-2.7.0}/decimer.egg-info/SOURCES.txt

@@ -19,5 +19,6 @@ DECIMER/efficientnetv2/utils.py
 decimer.egg-info/PKG-INFO
 decimer.egg-info/SOURCES.txt
 decimer.egg-info/dependency_links.txt
+decimer.egg-info/entry_points.txt
 decimer.egg-info/requires.txt
 decimer.egg-info/top_level.txt

decimer-2.7.0/decimer.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+decimer = DECIMER.decimer:main

{decimer-2.6.0 → decimer-2.7.0}/decimer.egg-info/requires.txt

@@ -1,4 +1,4 @@
-tensorflow>=2.12.0
+tensorflow<=2.15.0,>=2.12.0
 opencv-python
 pystow
 pillow-heif

{decimer-2.6.0 → decimer-2.7.0}/setup.py

@@ -1,52 +1,55 @@
-#!/usr/bin/env python
-import platform
-
-import setuptools
-
-if (
-    platform.processor() == "arm" or platform.processor() == "i386"
-) and platform.system() == "Darwin":
-    tensorflow_os = "tensorflow-macos>=2.10.0"
-else:
-    tensorflow_os = "tensorflow>=2.12.0"
-
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-setuptools.setup(
-    name="decimer",
-    version="2.6.0",
-    author="Kohulan Rajan",
-    author_email="kohulan.rajan@uni-jena.de",
-    maintainer="Kohulan Rajan, Otto Brinkhaus ",
-    maintainer_email="kohulan.rajan@uni-jena.de, otto.brinkhaus@uni-jena.de",
-    description="DECIMER 2.4.0: Deep Learning for Chemical Image Recognition using Efficient-Net V2 + Transformer",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/Kohulan/DECIMER-Image_Transformer",
-    packages=setuptools.find_packages(),
-    license="MIT",
-    install_requires=[
-        tensorflow_os,
-        "opencv-python",
-        "pystow",
-        "pillow-heif",
-        "efficientnet",
-        "selfies",
-        "pyyaml",
-    ],
-    package_data={"DECIMER": ["repack/*.*", "efficientnetv2/*.*", "Utils/*.*"]},
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3 :: Only",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires=">=3.5",
-)
+#!/usr/bin/env python
+import platform
+
+import setuptools
+
+if (
+    platform.processor() == "arm" or platform.processor() == "i386"
+) and platform.system() == "Darwin":
+    tensorflow_os = "tensorflow-macos>=2.10.0,<=2.15.0"
+else:
+    tensorflow_os = "tensorflow>=2.12.0,<=2.15.0"
+
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
+    name="decimer",
+    version="2.7.0",
+    author="Kohulan Rajan",
+    author_email="kohulan.rajan@uni-jena.de",
+    maintainer="Kohulan Rajan, Otto Brinkhaus ",
+    maintainer_email="kohulan.rajan@uni-jena.de, otto.brinkhaus@uni-jena.de",
+    description="DECIMER 2.6.0: Deep Learning for Chemical Image Recognition using Efficient-Net V2 + Transformer",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    entry_points={
+        "console_scripts": ["decimer = DECIMER.decimer:main"],
+    },
+    url="https://github.com/Kohulan/DECIMER-Image_Transformer",
+    packages=setuptools.find_packages(),
+    license="MIT",
+    install_requires=[
+        tensorflow_os,
+        "opencv-python",
+        "pystow",
+        "pillow-heif",
+        "efficientnet",
+        "selfies",
+        "pyyaml",
+    ],
+    package_data={"DECIMER": ["repack/*.*", "efficientnetv2/*.*", "Utils/*.*"]},
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3 :: Only",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+    ],
+    python_requires=">=3.5",
+)