PerSent 1.3.1__tar.gz → 1.3.2__tar.gz

{persent-1.3.1 → persent-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PerSent
-Version: 1.3.1
+Version: 1.3.2
 Summary: Persian Sentiment Analysis Toolkit
 Home-page: https://github.com/RezaGooner/PerSent
 Author: RezaGooner

{persent-1.3.1 → persent-1.3.2}/PerSent/CommentAnalyzer.py

@@ -9,6 +9,8 @@ from sklearn.linear_model import LogisticRegression
 from sklearn.model_selection import train_test_split
 import os
 import joblib
+import importlib.resources
+
 
 class CommentAnalyzer:
     def __init__(self, model_dir='PerSent/model'):
@@ -140,21 +142,35 @@ class CommentAnalyzer:
         except Exception as e:
             raise Exception(f"Error while saving model: {str(e)}")
     
+
     def loadModel(self):
-        """reload from file"""
+        """reload from package asset or model_dir"""
         try:
-            classifier_path = os.path.join(self.model_dir, 'classifier.joblib')
-            vectorizer_path = os.path.join(self.model_dir, 'word2vec.model')
+            classifier_filename = 'classifier.joblib'
+            vectorizer_filename = 'word2vec.model'
+
+            classifier_path = os.path.join(self.model_dir, classifier_filename)
+            vectorizer_path = os.path.join(self.model_dir, vectorizer_filename)
+
+            if os.path.exists(classifier_path) and os.path.exists(vectorizer_path):
+                self.classifier = joblib.load(classifier_path)
+                self.vectorizer = Word2Vec.load(vectorizer_path)
+                return
             
-            if not os.path.exists(classifier_path) or not os.path.exists(vectorizer_path):
-                raise FileNotFoundError("Model files not found in the specified directory")
-                
-            self.classifier = joblib.load(classifier_path)
-            self.vectorizer = Word2Vec.load(vectorizer_path)
-        except FileNotFoundError as e:
-            raise FileNotFoundError(f"Model files not found: {str(e)}")
+            try:
+                with importlib.resources.path("PerSent.models", classifier_filename) as clf_p, \
+                     importlib.resources.path("PerSent.models", vectorizer_filename) as vec_p:
+                    self.classifier = joblib.load(clf_p)
+                    self.vectorizer = Word2Vec.load(str(vec_p))
+            except FileNotFoundError as e:
+                raise FileNotFoundError("Model files not found in model_dir *and* package asset")
+            except Exception as e:
+                raise Exception(f"Failed to load model from package: {str(e)}")
+        
         except Exception as e:
             raise Exception(f"Failed to load model: {str(e)}")
+
+
         
     def analyzeCSV(self, input_csv, output_path, summary_path=None, text_column=0):
         """

{persent-1.3.1 → persent-1.3.2}/PerSent/SentimentAnalyzer.py

@@ -11,6 +11,7 @@ from collections import defaultdict
 from hazm import Stemmer, Lemmatizer, Normalizer, word_tokenize, stopwords_list
 from tqdm import tqdm
 import pandas as pd
+import importlib.resources
 
 class SentimentAnalyzer:
     """A Persian sentiment analyzer that supports word weighting"""
@@ -239,20 +240,15 @@ class SentimentAnalyzer:
         """
         try:
             model_path = os.path.join(self.model_dir, f'{model_name}.joblib')
-            
-            if not os.path.exists(model_path):
-                raise FileNotFoundError(f"Model file {model_path} not found")
-            
-            data = joblib.load(model_path)
+            if os.path.exists(model_path):
+                data = joblib.load(model_path)
+            else:
+                with importlib.resources.path("PerSent.models", f'{model_name}.joblib') as pkg_model_path:
+                    data = joblib.load(pkg_model_path)
             self.emotion_map = data['emotion_map']
             self.keywords = defaultdict(list, data['keywords'])
             self.word_weights = defaultdict(dict, data['word_weights'])
             self.model_loaded = True
-            
-        except FileNotFoundError as e:
-            raise FileNotFoundError(f"Model file not found: {str(e)}")
-        except (KeyError, AttributeError) as e:
-            raise ValueError(f"Invalid or corrupted model file: {str(e)}")
         except Exception as e:
             raise Exception(f"Failed to load model: {str(e)}")
     

{persent-1.3.1 → persent-1.3.2}/PerSent/__init__.py

@@ -3,8 +3,8 @@ from .SentimentAnalyzer import SentimentAnalyzer
 from pathlib import Path
 import os
 
-MODEL_DIR = Path(__file__).parent / "model"
+MODEL_DIR = Path(__file__).parent / "models"
 os.makedirs(MODEL_DIR, exist_ok=True)
 
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __all__ = ['CommentAnalyzer', 'SentimentAnalyzer', 'MODEL_DIR']

{persent-1.3.1 → persent-1.3.2}/PerSent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PerSent
-Version: 1.3.1
+Version: 1.3.2
 Summary: Persian Sentiment Analysis Toolkit
 Home-page: https://github.com/RezaGooner/PerSent
 Author: RezaGooner

{persent-1.3.1 → persent-1.3.2}/PerSent.egg-info/SOURCES.txt

@@ -10,6 +10,6 @@ PerSent.egg-info/SOURCES.txt
 PerSent.egg-info/dependency_links.txt
 PerSent.egg-info/requires.txt
 PerSent.egg-info/top_level.txt
-PerSent/model/classifier.joblib
-PerSent/model/weighted_sentiment_model.joblib
-PerSent/model/word2vec.model
+PerSent/models/classifier.joblib
+PerSent/models/weighted_sentiment_model.joblib
+PerSent/models/word2vec.model

{persent-1.3.1 → persent-1.3.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="PerSent",
-    version="1.3.1",
+    version="1.3.2",
     author="RezaGooner",
     author_email="RezaAsadiProgrammer@Gmail.com",
     description="Persian Sentiment Analysis Toolkit",
@@ -14,7 +14,7 @@ setup(
     url="https://github.com/RezaGooner/PerSent",
     packages=find_packages(),
     package_data={
-        'PerSent': ['CommentAnalyzer.py','SentimentAnalyzer.py' , 'model/*'],
+        'PerSent': ['CommentAnalyzer.py','SentimentAnalyzer.py' , 'models/*'],
     },
     include_package_data=True,
     install_requires=[