Merge pull request #27 from TailUFPB/develop

Develop

.github/workflows/develop.yml

@@ -99,9 +99,15 @@ jobs:
         with:
           node-version: "14"
 
-      - name: Install Wine
+      - name: Install Wine64
         run: sudo apt update && sudo apt install wine64
 
+      - name: Install Wine32
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update
+          sudo apt-get install wine32
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
         with:
@@ -126,19 +132,24 @@ jobs:
 
       - name: 📦 Electron Builder
         run: npm run electron:package:win
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get latest release number
         id: get_latest_release
         uses: actions/github-script@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const response = await github.repos.getLatestRelease({
+            const response = await github.repos.listReleases({
               owner: context.repo.owner,
-              repo: context.repo.repo
+              repo: context.repo.repo,
+              per_page: 10
             });
-            const latestRelease = response.data.tag_name;
-            const versionParts = latestRelease.replace(/^v/, '').split('.');
+
+            const latestPreRelease = response.data[0]; 
+            const preReleaseTag = latestPreRelease.name;
+            const versionParts = preReleaseTag.replace(/^v/, '').split('.');
             const newVersion = `${parseInt(versionParts[0])}.${parseInt(versionParts[1])}.${parseInt(versionParts[2]) + 1}`;
             console.log(`::set-output name=new_version::${newVersion}`);
 
@@ -152,7 +163,7 @@ jobs:
           files: |
             ./dist/LinguifAI\ Setup\ ${{ steps.get_latest_release.outputs.new_version }}.exe
           tag_name: v${{ steps.get_latest_release.outputs.new_version }}
-          name: Release v${{ steps.get_latest_release.outputs.new_version }}
+          name: v${{ steps.get_latest_release.outputs.new_version }}
           prerelease: true
           body: |
             Descrição do release aqui

.github/workflows/main.yml

@@ -141,13 +141,16 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const response = await github.repos.getLatestRelease({
+            const response = await github.repos.listReleases({
               owner: context.repo.owner,
-              repo: context.repo.repo
-            });
-            const latestRelease = response.data.tag_name;
-            const versionParts = latestRelease.replace(/^v/, '').split('.');
-            const newVersion = `${parseInt(versionParts[0])}.${parseInt(versionParts[1]) + 1}.0`;
+              repo: context.repo.repo,
+              per_page: 10
+            });    
+
+            const latestPreRelease = response.data[0];
+            const preReleaseTag = latestPreRelease.name;
+            const versionParts = preReleaseTag.replace(/^v/, '').split('.');
+            const newVersion = `${parseInt(versionParts[0])}.${parseInt(versionParts[1])+1}.0`;
             console.log(`::set-output name=new_version::${newVersion}`);
 
       - name: Rename file
@@ -160,7 +163,7 @@ jobs:
           files: |
             ./dist/LinguifAI\ Setup\ ${{ steps.get_latest_release.outputs.new_version }}.exe
           tag_name: v${{ steps.get_latest_release.outputs.new_version }}
-          name: Release v${{ steps.get_latest_release.outputs.new_version }}
+          name: v${{ steps.get_latest_release.outputs.new_version }}
           prerelease: true
           body: |
             Descrição do release aqui

api/DataProcesser.py

@@ -1,7 +1,6 @@
 
 from NbNewsModel import news_prediction
 from NbEmotionsModel import make_prediction
-from NbLinRegressionModel import make_prediction_nblin
 from available_classifiers import get_available_classifiers
 
 import Neural_Network2

api/HateSpeechModel.py

@@ -0,0 +1,16 @@
+import pickle
+
+def make_prediction(my_sentence):
+    model_file = "./models/hate_speech.pkl"
+    try:
+        # Carregando o pipeline do arquivo .pkl
+        with open(model_file, 'rb') as model_file:
+            pipeline = pickle.load(model_file)
+
+        # Fazendo previsões para os textos
+        predictions = pipeline.predict([my_sentence])
+
+        return predictions[0]
+
+    except Exception as e:
+        return str(e)

api/NbEmotionsModel.py

@@ -1,11 +1,5 @@
-import pandas as pd
 import pickle
 
-# bag of words
-from sklearn.feature_extraction.text import TfidfVectorizer
-
-#tfidf_vectorizer = TfidfVectorizer(use_idf=True)
-
 def make_prediction(my_sentence):
     model_file = "./models/emotions_pipeline.pkl"
     try:

api/NbNewsModel.py

@@ -1,4 +1,3 @@
-import pandas as pd
 import pickle
 
 def news_prediction(texts):

api/models_code/nb_emotions.py

@@ -1,8 +1,6 @@
 import pandas as pd
 import pickle
 from sklearn.pipeline import make_pipeline
-from sklearn.feature_extraction.text import CountVectorizer
-from sklearn.feature_extraction.text import TfidfVectorizer
 
 # bag of words
 from sklearn.feature_extraction.text import TfidfVectorizer
@@ -11,7 +9,12 @@
 from sklearn.naive_bayes import MultinomialNB
 
 df = pd.read_csv('../training_df/tweet_emotions.csv')
-train_data, test_data, train_target, test_target = train_test_split(df["content"], df["sentiment"], test_size=0.2, shuffle=True)
+
+# Dividindo os dados em um conjunto de treinamento e um conjunto de teste
+x = df['content']
+y = df['sentiment']
+
+train_data, test_data, train_target, test_target = train_test_split(x, y, test_size=0.2, shuffle=True)
 
 # Criando um pipeline com o vetorizador TF-IDF e o classificador Multinomial Naive Bayes
 pipeline = make_pipeline(TfidfVectorizer(), MultinomialNB())

api/models_code/nb_hatespeech.py

@@ -0,0 +1,27 @@
+import pandas as pd
+import pickle
+from sklearn.pipeline import make_pipeline
+
+# bag of words
+from sklearn.feature_extraction.text import TfidfVectorizer
+
+from sklearn.model_selection import train_test_split
+from sklearn.naive_bayes import MultinomialNB
+
+df = pd.read_csv("../training_df/nb_hatespeech.csv", sep=';')
+
+# Dividindo os dados em um conjunto de treinamento e um conjunto de teste
+x = df["comment"]
+y = df["isHate"]
+
+X_train, X_test, y_train, y_test = train_test_split(x, y, test_size=0.2, random_state=42)
+
+# Criando um pipeline com o vetorizador TF-IDF e o classificador Multinomial Naive Bayes
+pipeline = make_pipeline(TfidfVectorizer(), MultinomialNB())
+
+# Ajustando o modelo ao conjunto de treinamento
+pipeline.fit(X_train, y_train)
+
+# Salvando o pipeline em um arquivo .pkl
+with open("hate_speech.pkl", "wb") as model_file:
+    pickle.dump(pipeline, model_file)

api/models_code/nb_news.py

@@ -1,18 +1,20 @@
 import pandas as pd
 import pickle
 from sklearn.pipeline import make_pipeline
-from sklearn.feature_extraction.text import CountVectorizer
+
+# bag of words
 from sklearn.feature_extraction.text import TfidfVectorizer
+
 from sklearn.model_selection import train_test_split
 from sklearn.naive_bayes import MultinomialNB
 
 df = pd.read_csv("../training_df/nb_news.csv")
+
 # Dividindo os dados em um conjunto de treinamento e um conjunto de teste
 x = df['short_description']
 y = df['category']
 
 X_train, X_test, y_train, y_test = train_test_split(x, y, test_size=0.2, random_state=42)
-# Criando um pipeline que inclui o vetorizador TF-IDF e o modelo Naive Bayes
 
 # Criando um pipeline com o vetorizador TF-IDF e o classificador Multinomial Naive Bayes
 pipeline = make_pipeline(TfidfVectorizer(), MultinomialNB())

api/requirements.txt.orig

@@ -0,0 +1,24 @@
+<<<<<<< Updated upstream:api/requirements.txt
+Flask==2.3.2
+Flask-Cors==4.0.0
+pandas==2.0.3
+nltk==3.8.1
+scikit-learn==1.3.0
+numpy==1.25.2
+matplotlib==3.7.1
+seaborn==0.13.0
+tensorflow==2.16.1
+keras==3.0.0
+=======
+Flask==2.3.2
+Flask-Cors==4.0.0
+pandas==2.0.3
+nltk==3.8.1
+scikit-learn==1.3.0
+numpy==1.25.2
+matplotlib==3.7.1
+seaborn==0.13.0
+tensorflow==2.16.1
+keras==3.0.0
+torchtext==0.17.2
+>>>>>>> Stashed changes:requirements.txt