modification setup.py -> pyproject.toml + publish modif

Author: stadiello

.github/workflows/pypi-publish.yml

@@ -27,16 +27,11 @@ jobs:
       run: |
         python -m pip show setuptools wheel || python -m pip install setuptools wheel
         
-    - name: Extract package version
-      run: echo "TAG_NAME=${{ github.ref_name }}" >> $GITHUB_ENV
-
-    - name: Update version in setup.py
-      run: sed -i "s/{{VERSION_PLACEHOLDER}}/${{ env.TAG_NAME }}/g" setup.py
     
     - name: Build the package
       run: |
         python setup.py sdist bdist_wheel
-    
+
     - name: Test with pytest
       run: |
         pytest -v

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

memory.log

@@ -0,0 +1,31 @@
+[build-system]
+requires = ["setuptools>=61.0", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "shortterm-memory"
+dynamic = ["version", "dependencies"]
+description = "Une approche pour la gestion de la mémoire à court terme dans les chatbots."
+readme = "README.md"
+requires-python = ">=3.9"
+license = { text = "MIT" }
+authors = [
+  { name = "Tadiello Sébastien", email = "[email protected]" }
+]
+urls = { Homepage = "https://github.com/stadiello/ShortTerm-memory" }
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent"
+]
+
+[tool.setuptools]
+packages = ["shortterm_memory"]
+package-dir = { "" = "src" }
+
+[tool.setuptools.dynamic]
+dependencies = { file = ["requirements.txt"] }
+
+[tool.setuptools_scm]
+version_scheme = "guess-next-dev"
+local_scheme = "no-local-version"

pyproject.toml

@@ -1,8 +1,9 @@
+"""Module providing a Memory Class for a Chatbot."""
+
+import uuid
 import torch
 from transformers import BartTokenizer, BartForConditionalGeneration
 from logs.logger import logging, logger_mem
-from datetime import date
-import uuid
 from mem_db.vecto import get_or_create_collection
 
 
@@ -23,7 +24,7 @@ def __new__(cls):
             cls._instance = super(BartSingleton, cls).__new__(cls)
             cls._instance.tokenizer = BartTokenizer.from_pretrained('facebook/bart-large-cnn')
             cls._instance.model = BartForConditionalGeneration.from_pretrained('facebook/bart-large-cnn').to(device)
-        return cls._instance
+        return cls._instance 
 
     @classmethod
     def reset(cls):

setup.py

@@ -1,10 +1,12 @@
+"""Mdoule de test pour la mémoire du chatbot"""
+
+from unittest.mock import patch, MagicMock
+import pytest
 import sys
 import os
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../src')))
+from shortterm_memory.chatbot_memory import ChatbotMemory
 
-import pytest
-from unittest.mock import patch, MagicMock
-from shortterm_memory.ChatbotMemory import ChatbotMemory  
 
 @pytest.fixture
 def mock_tokenizer():
@@ -26,8 +28,8 @@ def mock_model():
     model.generate.return_value = [[0] * 10]
     return model
 
-@patch("shortterm_memory.ChatbotMemory.BartTokenizer.from_pretrained")
-@patch("shortterm_memory.ChatbotMemory.BartForConditionalGeneration.from_pretrained")
+@patch("shortterm_memory.chatbot_memory.BartTokenizer.from_pretrained")
+@patch("shortterm_memory.chatbot_memory.BartForConditionalGeneration.from_pretrained")
 def test_update_and_get_memory(mock_bart_model, mock_bart_tokenizer, mock_tokenizer, mock_model):
     mock_bart_tokenizer.return_value = mock_tokenizer
     mock_bart_model.return_value = mock_model
@@ -43,8 +45,8 @@ def test_update_and_get_memory(mock_bart_model, mock_bart_tokenizer, mock_tokeni
     assert mem[0]['user'] == "Bonjour"
     assert mem[0]['bot'] == "Salut !"
 
-@patch("shortterm_memory.ChatbotMemory.BartTokenizer.from_pretrained")
-@patch("shortterm_memory.ChatbotMemory.BartForConditionalGeneration.from_pretrained")
+@patch("shortterm_memory.chatbot_memory.BartTokenizer.from_pretrained")
+@patch("shortterm_memory.chatbot_memory.BartForConditionalGeneration.from_pretrained")
 def test_memory_counter(mock_bart_model, mock_bart_tokenizer, mock_tokenizer, mock_model):
     mock_bart_tokenizer.return_value = mock_tokenizer
     mock_bart_model.return_value = mock_model
@@ -56,8 +58,8 @@ def test_memory_counter(mock_bart_model, mock_bart_tokenizer, mock_tokenizer, mo
     token_count = chat_memory.memory_counter()
     assert token_count > 0
 
-@patch("shortterm_memory.ChatbotMemory.BartTokenizer.from_pretrained")
-@patch("shortterm_memory.ChatbotMemory.BartForConditionalGeneration.from_pretrained")
+@patch("shortterm_memory.chatbot_memory.BartTokenizer.from_pretrained")
+@patch("shortterm_memory.chatbot_memory.BartForConditionalGeneration.from_pretrained")
 def test_compressed_memory(mock_bart_model, mock_bart_tokenizer, mock_tokenizer, mock_model):
     mock_bart_tokenizer.return_value = mock_tokenizer
     mock_bart_model.return_value = mock_model