bertrend 0.3.17__tar.gz → 0.3.18__tar.gz

{bertrend-0.3.17 → bertrend-0.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bertrend
-Version: 0.3.17
+Version: 0.3.18
 Summary: BERTrend analyses topic evolution over time using state-of-the-art transformer models: topic modelling and LLM
 License: LICENSE.md
 License-File: AUTHORS.txt
@@ -64,7 +64,7 @@ Requires-Dist: sentencepiece (>=0.2.0)
 Requires-Dist: starlette (>=0.46.2)
 Requires-Dist: streamlit (>=1.48)
 Requires-Dist: streamlit-code-editor (>=0.1.22)
-Requires-Dist: supervisor (>=4.2.5)
+Requires-Dist: supervisor (>=4.3.0)
 Requires-Dist: thefuzz (>=0.22.1)
 Requires-Dist: tiktoken (>=0.8.0)
 Requires-Dist: tldextract (>=2.0.1)
@@ -165,6 +165,12 @@ BERTrend requires the following environment variables to be set:
 - Recommended: at least one GPU with 16GB RAM for faster processing
 - Python >= 3.12 is required
 
+### Docker Installation
+
+BERTrend can be run using Docker, which provides an easy way to run the application without installing dependencies directly on your system.
+
+For detailed instructions on using BERTrend with Docker, see the [Docker documentation](./docs/docker.md).
+
 ### Package Installation
 
 - (Recommended): create a new python environment using `venv` or `conda`: 

{bertrend-0.3.17 → bertrend-0.3.18}/README.md

@@ -84,6 +84,12 @@ BERTrend requires the following environment variables to be set:
 - Recommended: at least one GPU with 16GB RAM for faster processing
 - Python >= 3.12 is required
 
+### Docker Installation
+
+BERTrend can be run using Docker, which provides an easy way to run the application without installing dependencies directly on your system.
+
+For detailed instructions on using BERTrend with Docker, see the [Docker documentation](./docs/docker.md).
+
 ### Package Installation
 
 - (Recommended): create a new python environment using `venv` or `conda`: 

bertrend-0.3.18/bertrend/services/cert.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID9TCCAt2gAwIBAgIUM6hXH97es1ndg39f9EANtiNZJMwwDQYJKoZIhvcNAQEL
+BQAwgYkxCzAJBgNVBAYTAkZSMQwwCgYDVQQIDANJREYxFjAUBgNVBAcMDUxhIETD
+g8KpZmVuc2UxDDAKBgNVBAoMA1JURTENMAsGA1UECwwERFNJQTERMA8GA1UEAwwI
+V2F0dEVsc2UxJDAiBgkqhkiG9w0BCQEWFXdhdHRlbHNlLmFpQGdtYWlsLmNvbTAe
+Fw0yNTAzMTQxNTA3MDhaFw0yNjAzMTQxNTA3MDhaMIGJMQswCQYDVQQGEwJGUjEM
+MAoGA1UECAwDSURGMRYwFAYDVQQHDA1MYSBEw4PCqWZlbnNlMQwwCgYDVQQKDANS
+VEUxDTALBgNVBAsMBERTSUExETAPBgNVBAMMCFdhdHRFbHNlMSQwIgYJKoZIhvcN
+AQkBFhV3YXR0ZWxzZS5haUBnbWFpbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDFVmuM5t6cLCUlZU8Bs9ejZvRa3YlnlWPFIdzD0uuyFKcEBNC3
+snkTCxExdlaRVj5Ph9E6a+cxQ1V4kBQ5JOhiMzqyLA9z8RqTnkk/ReDqq4QG2nXf
++rMnYLswesKVvTO84Bd46pDVm27omeqw6sfYBmSs1roxL0gO7h8bsDLekgMkrzag
+gaNNasdwA7wCSGyE4MbVojlcdFTVPEJCWDfH94sTLN1kfJZQOANfD7S9DYTaLGC+
+SZ1D3/fwDdCdAodPuk+2A8kQGAjDAm6+2M3RWeSJAnQ1fRaNdXeJagRqDPRh081u
+QnriqxFuZ1t3Oh/23sXebwzUh2CrMrUmkdWtAgMBAAGjUzBRMB0GA1UdDgQWBBRK
+lPW4foUkhlmqxvnskcbGbQT3YzAfBgNVHSMEGDAWgBRKlPW4foUkhlmqxvnskcbG
+bQT3YzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCtY+Atcdz9
+/vBZw3r8L5TZ8a/xe1AmME73IS2LpXkEsjs58XPpa6lyeIIkyh3lTaH4OshmECML
+H4RvdqfCOg9BblYziSp5JfZdGcbqWypcVqA207k701M2SmowAYOkaYL3L6y5O18w
+OlQIL5JYvmASj7BXZSireQuJOgJjYn7f3mDEtSayQh/U+53NewbgF1gI/w4HO73L
+oKYDWsyMW0ekW0dy5VCyVqjfI8cVgEF3ilpuB1dMkWyIKkiGBswgTvvechj6jjhY
+xdL1Xvo9g1ZQ+2wcQ1b8KfPnE49hMQLIrd5YUa3ReXPGJhEr6bwsTN3HFgR7RTGj
+CNTUWxog71Yk
+-----END CERTIFICATE-----

bertrend-0.3.18/bertrend/services/embedding_server/requirements.txt

@@ -0,0 +1,10 @@
+fastapi
+pydantic
+pydantic_settings
+python-multipart
+urllib3
+uvicorn
+PyJWT
+loguru
+dotenv
+sentence_transformers

{bertrend-0.3.17 → bertrend-0.3.18}/bertrend/services/embedding_server/start.py

@@ -17,7 +17,7 @@ os.environ["CUDA_VISIBLE_DEVICES"] = CONFIG.cuda_visible_devices
 # Start the FastAPI application
 if __name__ == "__main__":
     uvicorn.run(
-        "wattelse.api.embedding.main:app",
+        "bertrend.services.embedding_server.main:app",
         host=CONFIG.host,
         port=CONFIG.port,
         workers=CONFIG.number_workers,

bertrend-0.3.18/bertrend/services/key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDFVmuM5t6cLCUl
+ZU8Bs9ejZvRa3YlnlWPFIdzD0uuyFKcEBNC3snkTCxExdlaRVj5Ph9E6a+cxQ1V4
+kBQ5JOhiMzqyLA9z8RqTnkk/ReDqq4QG2nXf+rMnYLswesKVvTO84Bd46pDVm27o
+meqw6sfYBmSs1roxL0gO7h8bsDLekgMkrzaggaNNasdwA7wCSGyE4MbVojlcdFTV
+PEJCWDfH94sTLN1kfJZQOANfD7S9DYTaLGC+SZ1D3/fwDdCdAodPuk+2A8kQGAjD
+Am6+2M3RWeSJAnQ1fRaNdXeJagRqDPRh081uQnriqxFuZ1t3Oh/23sXebwzUh2Cr
+MrUmkdWtAgMBAAECggEABTtUz6ABT9+lvneQoClt8qGUoeIUtf/SbNQIf9KUOBzv
+Dp64D9618gjNlGOgSOsh7Mbbh7J7pyUzW2ZqetddJ9lW2YlsgXTncPl11K0cGOyi
+K/JXxK/nVwhr/g2LIiApgnzocma5n0gnKRiHjdgzoykMOz7YIdywiuDKR1glCRyG
++NLp+f7WCh6kqoIwCmhCIH1dTg+85wUhh/dCXyWyL1EPYSBlGO8ulaVhb2Ym5hpV
+B7VDAqMkODgRyh5WfUiv+1Cvy6VVX+aay47z/tAt3eoEJa2bqItSZu7alaV8sxDq
+gXJFSd6j4dofeSFO9qODKoPXRrDEfA6LDCYduQ5KMQKBgQDg2llYa09vB7VesIYn
+CzDK4ndLbjrcpre+KKf6pJfcMc0GI+biNzv9yg0vYRYSQExHbGdfOlf2loZHjK0Q
+hr938GBQlvH0S81BWtLDe41Qogv7Fb5G4uuxrSJ33S2dn0frdQhDsTk5rgZ8/VFG
+2IQ1cbdqOW6jsy0VaYbdW0X2BQKBgQDgrFUDbIyXSj/KjuP5gm4dJBIkCxcRdK6V
+ey2b6EtlYfjpPpMUZZFocYuLKnVa1+xRF65beu8YAC95srNkIUlIZFYTZ7A3cuQO
+Lc3BQCzQ7smX3rY9p5W/mVfbuOV+pyulMoTa0892Bwp9a3InMT3wHW06HtgDo+Pk
+dbsvXH8JiQKBgFp3f3sTseH6N/7hBxiuZ/M5KsYuk4Azk7nuoac2keMGJndR+pMJ
+phl2MdfeOAMf25DhDLZDwyBzb5NaBkef72lSTW4fTTn9RZgF8saz7yeCC0/6b5QV
+uL7D6hpP4wqIC2ewrqKNq3iJjBK92PWoJ4lZN3KFqP40GO+Ehb6J+pwBAoGBAK4J
+8OTxHktH0fiIDeNG/SOHwKG5EYqNF3xl6eO+40DKzvVnaqm/MA92/YC1SCkx4DbF
+IGRu621tH1mnaz1iZ5EzYFYx2Rhq4Gx3YM6VduH2R6VkeUlzWxYLpDpplSUyPCYA
+51dYAnpMY/zZ0Zi4lWE+elEueWkAeNWNuY2rmiD5AoGBALKceX9ppLb5M8HwQEK8
+rQ0FTYBaghm2sSOZU57KZY9YLNo56K76mEtl4iXWmPCchBP5ZYrcqXwsg+I0AHDw
+yXGonYg2iz8FCAM9Z2ZL0unBvLaI990Jk/BUx+/LaKNCSevmIAsJHcNaKguTV+p1
+srfPtuh8q+RA3txjrCxouA3B
+-----END PRIVATE KEY-----

{bertrend-0.3.17 → bertrend-0.3.18}/bertrend_apps/prospective_demo/__init__.py

@@ -28,12 +28,13 @@ URLS_COLUMN = "URLs"
 # Models & analysis
 DEFAULT_GRANULARITY = 7
 DEFAULT_WINDOW_SIZE = 7
+DEFAULT_LANGUAGE = "en"
 
 DEFAULT_ANALYSIS_CFG = {
     "model_config": {
         "granularity": DEFAULT_GRANULARITY,
         "window_size": DEFAULT_WINDOW_SIZE,
-        "language": "English",
+        "language": DEFAULT_LANGUAGE,
         "split_by_paragraph": True,
     },
     "analysis_config": {

{bertrend-0.3.17 → bertrend-0.3.18}/bertrend_apps/prospective_demo/dashboard_analysis.py

@@ -118,7 +118,7 @@ def display_detailed_analysis(
         desc["analysis"]
     )
     # Use current language for HTML template
-    lang = get_current_internationalization_language()
+    lang = st.session_state.model_analysis_cfg[model_id]["model_config"]["language"]
     formatted_html = fill_html_template(summaries, signal_analysis, lang)
     st.html(formatted_html)
 

{bertrend-0.3.17 → bertrend-0.3.18}/bertrend_apps/prospective_demo/models_info.py

@@ -15,6 +15,7 @@ import toml
 from loguru import logger
 
 from bertrend import BERTREND_LOG_PATH, BEST_CUDA_DEVICE, load_toml_config
+from bertrend.config.parameters import LANGUAGES
 from bertrend.demos.demos_utils.i18n import translate
 from bertrend.demos.demos_utils.icons import (
     EDIT_ICON,
@@ -65,12 +66,7 @@ def models_monitoring():
             # align language with the feed
             st.session_state.model_analysis_cfg[model_id]["model_config"][
                 "language"
-            ] = (
-                "French"
-                if st.session_state.user_feeds[model_id]["data-feed"]["language"]
-                == "fr"
-                else "English"
-            )
+            ] = st.session_state.user_feeds[model_id]["data-feed"]["language"]
             # special case for split by paragraphs
             st.session_state.model_analysis_cfg[model_id]["model_config"][
                 "split_by_paragraph"
@@ -157,6 +153,20 @@ def edit_model_parameters(row_dict: dict):
         help=f"{INFO_ICON} {translate('split_by_paragraph_help')}",
     )
 
+    language = st.segmented_control(
+        translate("feed_language_label"),
+        selection_mode="single",
+        options=LANGUAGES,
+        default=(
+            LANGUAGES[0]
+            if st.session_state.model_analysis_cfg[model_id]["model_config"]["language"]
+            == "fr"
+            else LANGUAGES[1]
+        ),
+        format_func=lambda lang: translate(f"language_{lang.lower()}"),
+        help=translate("feed_language_help"),
+    )
+
     st.write(f"**{translate('analysis_params_title').format(model_id)}**")
     topic_evolution = st.checkbox(
         translate("topic_evolution"),
@@ -180,11 +190,7 @@ def edit_model_parameters(row_dict: dict):
     model_config = {
         "granularity": new_granularity,
         "window_size": new_window_size,
-        "language": (
-            "French"
-            if st.session_state.user_feeds[model_id]["data-feed"]["language"] == "fr"
-            else "English"
-        ),
+        "language": "fr" if language == "French" else "en",
         "split_by_paragraph": split_by_paragraph,
     }
     analysis_config = {

{bertrend-0.3.17 → bertrend-0.3.18}/bertrend_apps/prospective_demo/report_generation.py

@@ -197,12 +197,7 @@ def generate_report(
     detailed_newsletter: DetailedNewsletter = create_detailed_newsletter(
         weak_signals, strong_signals, options
     )
-    language = (
-        "en"
-        if st.session_state.model_analysis_cfg[model_id]["model_config"]["language"]
-        == "English"
-        else "fr"
-    )
+    language = st.session_state.model_analysis_cfg[model_id]["model_config"]["language"]
     # Generate the HTML
     output_html = render_html_report(
         newsletter=detailed_newsletter,

{bertrend-0.3.17 → bertrend-0.3.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bertrend"
-version = "0.3.17"
+version = "0.3.18"
 description = "BERTrend analyses topic evolution over time using state-of-the-art transformer models: topic modelling and LLM"
 license = "LICENSE.md"
 readme = "README.md"
@@ -60,7 +60,7 @@ dependencies = [
     "sentencepiece (>=0.2.0)",
     "streamlit (>=1.48)",
     "streamlit-code-editor (>=0.1.22)",
-    "supervisor (>=4.2.5)",
+    "supervisor (>=4.3.0)",
     "tldextract (>=2.0.1)",
     "thefuzz (>=0.22.1)",
     "torch (>=2.7.0)",