scitex 2.0.0__py2.py3-none-any.whl → 2.1.0__py2.py3-none-any.whl

scitex/{ai/genai/llama.py → ml/_gen_ai/_Llama.py}

@@ -3,16 +3,10 @@
 # Time-stamp: "2024-11-05 21:11:08 (ywatanabe)"
 # File: ./scitex_repo/src/scitex/ai/_gen_ai/_Llama.py
 
-"""
-DEPRECATED: This module is deprecated. Please use llama_provider.py instead.
-The new provider-based architecture offers better modularity and maintainability.
-"""
-
 """Imports"""
 import os
 import sys
 from typing import List, Optional
-import warnings
 
 import matplotlib.pyplot as plt
 import scitex
@@ -23,14 +17,7 @@ try:
 except:
     pass
 
-from .base_genai import BaseGenAI
-
-warnings.warn(
-    "llama.py is deprecated. Please use llama_provider.py instead. "
-    "See PROVIDER_MIGRATION_GUIDE.md for migration instructions.",
-    DeprecationWarning,
-    stacklevel=2,
-)
+from ._BaseGenAI import BaseGenAI
 
 """Functions & Classes"""
 
@@ -148,8 +135,8 @@ def main():
 
 if __name__ == "__main__":
     # Main
-    CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.gen.start(sys, plt, verbose=False)
+    CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.session.start(sys, plt, verbose=False)
     main()
-    scitex.gen.close(CONFIG, verbose=False, notify=False)
+    scitex.session.close(CONFIG, verbose=False, notify=False)
 
 # EOF

scitex/{ai/genai/openai.py → ml/_gen_ai/_OpenAI.py}

@@ -9,7 +9,7 @@ THIS_FILE = "/home/ywatanabe/proj/scitex_repo/src/scitex/ai/_gen_ai/_OpenAI.py"
 """Imports"""
 import os
 from openai import OpenAI as _OpenAI
-from .base_genai import BaseGenAI
+from ._BaseGenAI import BaseGenAI
 
 """Functions & Classes"""
 
@@ -218,9 +218,9 @@ if __name__ == "__main__":
     import matplotlib.pyplot as plt
     import scitex
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.gen.start(sys, plt, verbose=False)
+    CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.session.start(sys, plt, verbose=False)
     main()
-    scitex.gen.close(CONFIG, verbose=False, notify=False)
+    scitex.session.close(CONFIG, verbose=False, notify=False)
 
 # EOF
 """

scitex/{ai/genai/params.py → ml/_gen_ai/_PARAMS.py}

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Timestamp: "2025-05-13 18:50:00 (ywatanabe)"
+# Timestamp: "2025-09-30 06:38:18 (ywatanabe)"
 # File: /home/ywatanabe/proj/scitex_repo/src/scitex/ai/_gen_ai/_PARAMS.py
 # ----------------------------------------
+from __future__ import annotations
 import os
-
-__FILE__ = "./src/scitex/ai/_gen_ai/_PARAMS.py"
+__FILE__ = __file__
 __DIR__ = os.path.dirname(__FILE__)
 # ----------------------------------------
 
@@ -201,6 +201,34 @@ OPENAI_MODELS = [
 # https://docs.anthropic.com/en/docs/build-with-claude/prompt-caching#pricing
 # https://docs.anthropic.com/en/docs/about-claude/models#model-comparison-table
 ANTHROPIC_MODELS = [
+    {
+        "name": "claude-opus-4-1-20250805",
+        "input_cost": 15.00,
+        "output_cost": 75.00,
+        "api_key_env": "ANTHROPIC_API_KEY",
+        "provider": "Anthropic",
+    },
+    {
+        "name": "claude-opus-4-20250514",
+        "input_cost": 15.00,
+        "output_cost": 75.00,
+        "api_key_env": "ANTHROPIC_API_KEY",
+        "provider": "Anthropic",
+    },
+    {
+        "name": "claude-sonnet-4-5-20250929",
+        "input_cost": 3.00,
+        "output_cost": 15.00,
+        "api_key_env": "ANTHROPIC_API_KEY",
+        "provider": "Anthropic",
+    },
+    {
+        "name": "claude-sonnet-4-20250514",
+        "input_cost": 3.00,
+        "output_cost": 15.00,
+        "api_key_env": "ANTHROPIC_API_KEY",
+        "provider": "Anthropic",
+    },
     {
         "name": "claude-3-7-sonnet-20250219",
         "input_cost": 3.00,
@@ -215,6 +243,13 @@ ANTHROPIC_MODELS = [
         "api_key_env": "ANTHROPIC_API_KEY",
         "provider": "Anthropic",
     },
+    {
+        "name": "claude-haiku-4-5-20251001",
+        "input_cost": 1.00,
+        "output_cost": 5.00,
+        "api_key_env": "ANTHROPIC_API_KEY",
+        "provider": "Anthropic",
+    },
     {
         "name": "claude-3-5-haiku-20241022",
         "input_cost": 0.80,
@@ -249,86 +284,37 @@ ANTHROPIC_MODELS = [
 # https://ai.google.dev/gemini-api/docs/pricing
 GOOGLE_MODELS = [
     {
-        "name": "gemini-2.5-flash-preview-04-17",
-        "input_cost": 0.15,
-        "output_cost": 3.50,
+        "name": "gemini-2.5-pro",
+        "input_cost": 2.50,
+        "output_cost": 10.00,
         "api_key_env": "GOOGLE_API_KEY",
         "provider": "Google",
     },
     {
-        "name": "gemini-2.5-pro-exp-03-25",
-        "input_cost": 1.25,
-        "output_cost": 10.00,
+        "name": "gemini-2.5-flash",
+        "input_cost": 0.30,
+        "output_cost": 2.50,
         "api_key_env": "GOOGLE_API_KEY",
         "provider": "Google",
     },
     {
-        "name": "gemini-2.0-flash",
+        "name": "gemini-2.5-flash-lite",
         "input_cost": 0.10,
         "output_cost": 0.40,
         "api_key_env": "GOOGLE_API_KEY",
         "provider": "Google",
     },
     {
-        "name": "gemini-2.0-flash-lite-preview-02-05",
-        "input_cost": 0.075,
-        "output_cost": 0.30,
-        "api_key_env": "GOOGLE_API_KEY",
-        "provider": "Google",
-    },
-    {
-        "name": "gemini-2.0-pro-exp-02-05",
-        "input_cost": None,
-        "output_cost": None,
-        "api_key_env": "GOOGLE_API_KEY",
-        "provider": "Google",
-    },
-    {
-        "name": "gemini-2.0-flash-thinking-exp-01-21",
-        "input_cost": None,
-        "output_cost": None,
-        "api_key_env": "GOOGLE_API_KEY",
-        "provider": "Google",
-    },
-    {
-        "name": "gemini-exp-1206",
-        "input_cost": None,
-        "output_cost": None,
-        "api_key_env": "GOOGLE_API_KEY",
-        "provider": "Google",
-    },
-    {
-        "name": "gemini-2.0-flash-exp",
-        "input_cost": None,
-        "output_cost": None,
-        "api_key_env": "GOOGLE_API_KEY",
-        "provider": "Google",
-    },
-    {
-        "name": "gemini-1.5-pro-latest",
-        "input_cost": 3.50,
-        "output_cost": 10.50,
-        "api_key_env": "GOOGLE_API_KEY",
-        "provider": "Google",
-    },
-    {
-        "name": "gemini-1.5-pro",
-        "input_cost": 3.50,
-        "output_cost": 10.50,
-        "api_key_env": "GOOGLE_API_KEY",
-        "provider": "Google",
-    },
-    {
-        "name": "gemini-1.5-flash-latest",
-        "input_cost": 0.15,
-        "output_cost": 0.0375,
+        "name": "gemini-2.0-flash",
+        "input_cost": 0.10,
+        "output_cost": 0.40,
         "api_key_env": "GOOGLE_API_KEY",
         "provider": "Google",
     },
     {
-        "name": "gemini-1.5-flash",
-        "input_cost": 0.15,
-        "output_cost": 0.0375,
+        "name": "gemini-2.0-flash-lite",
+        "input_cost": 0.075,
+        "output_cost": 0.30,
         "api_key_env": "GOOGLE_API_KEY",
         "provider": "Google",
     },

scitex/{ai/genai/perplexity.py → ml/_gen_ai/_Perplexity.py}

@@ -16,9 +16,6 @@ Output:
 Prerequisites:
     - Perplexity API key
     - openai package
-
-DEPRECATED: This module is deprecated. Please use perplexity_provider.py instead.
-The new provider-based architecture offers better modularity and maintainability.
 """
 
 """Imports"""
@@ -26,19 +23,11 @@ import os
 import sys
 from pprint import pprint
 from typing import Dict, Generator, List, Optional
-import warnings
 
 import matplotlib.pyplot as plt
 from openai import OpenAI
 
-from .base_genai import BaseGenAI
-
-warnings.warn(
-    "perplexity.py is deprecated. Please use perplexity_provider.py instead. "
-    "See PROVIDER_MIGRATION_GUIDE.md for migration instructions.",
-    DeprecationWarning,
-    stacklevel=2,
-)
+from ._BaseGenAI import BaseGenAI
 
 """Functions & Classes"""
 
@@ -195,8 +184,8 @@ def main():
 if __name__ == "__main__":
     import scitex
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.gen.start(sys, plt, verbose=False)
+    CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.session.start(sys, plt, verbose=False)
     main()
-    scitex.gen.close(CONFIG, verbose=False, notify=False)
+    scitex.session.close(CONFIG, verbose=False, notify=False)
 
 # EOF

scitex/ml/_gen_ai/__init__.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Timestamp: "2025-07-14 13:51:57 (ywatanabe)"
+# File: /ssh:sp:/home/ywatanabe/proj/scitex_repo/src/scitex/ai/_gen_ai/__init__.py
+# ----------------------------------------
+import os
+__FILE__ = __file__
+__DIR__ = os.path.dirname(__FILE__)
+# ----------------------------------------
+#!./env/bin/python3
+# Time-stamp: "2024-07-29 14:55:00 (ywatanabe)"
+# /home/ywatanabe/proj/scitex/src/scitex/ml/_gen_ai/__init__.py
+
+from ._PARAMS import MODELS
+from ._BaseGenAI import BaseGenAI
+from ._Anthropic import Anthropic
+from ._DeepSeek import DeepSeek
+from ._Google import Google
+from ._Groq import Groq
+from ._Llama import Llama
+from ._OpenAI import OpenAI
+from ._Perplexity import Perplexity
+from ._calc_cost import calc_cost
+from ._format_output_func import format_output_func
+from ._genai_factory import genai_factory as GenAI
+
+__all__ = [
+    "GenAI"
+    # "MODELS",
+    # "BaseGenAI",
+    # "Anthropic",
+    # "DeepSeek",
+    # "Google",
+    # "Groq",
+    # "Llama",
+    # "OpenAI",
+    # "Perplexity",
+    # "calc_cost",
+    # "format_output_func",
+    # "genai_factory",
+]
+
+# EOF

scitex/{ai/genai/calc_cost.py → ml/_gen_ai/_calc_cost.py}

@@ -20,7 +20,7 @@ Prerequisites:
 from typing import Union, Any
 import pandas as pd
 
-from .params import MODELS
+from ._PARAMS import MODELS
 
 
 def calc_cost(model: str, input_tokens: int, output_tokens: int) -> float:

scitex/{ai/genai/format_output_func.py → ml/_gen_ai/_format_output_func.py}

@@ -80,9 +80,9 @@ def main() -> None:
 
 
 if __name__ == "__main__":
-    CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.gen.start(sys, plt, verbose=False)
+    CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.session.start(sys, plt, verbose=False)
     main()
-    scitex.gen.close(CONFIG, verbose=False, notify=False)
+    scitex.session.close(CONFIG, verbose=False, notify=False)
 
 # EOF
 # #!/usr/bin/env python3
@@ -172,11 +172,11 @@ if __name__ == "__main__":
 #     # args = parser.parse_args()
 
 #     # Main
-#     CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.gen.start(
+#     CONFIG, sys.stdout, sys.stderr, plt, CC = scitex.session.start(
 #         sys, plt, verbose=False
 #     )
 #     main()
-#     scitex.gen.close(CONFIG, verbose=False, notify=False)
+#     scitex.session.close(CONFIG, verbose=False, notify=False)
 
 #
 

scitex/{ai/genai/genai_factory.py → ml/_gen_ai/_genai_factory.py}

@@ -11,14 +11,14 @@ __DIR__ = os.path.dirname(__FILE__)
 
 import random
 
-from .anthropic import Anthropic
-from .deepseek import DeepSeek
-from .google import Google
-from .groq import Groq
-from .llama import Llama
-from .openai import OpenAI
-from .params import MODELS
-from .perplexity import Perplexity
+from ._Anthropic import Anthropic
+from ._DeepSeek import DeepSeek
+from ._Google import Google
+from ._Groq import Groq
+from ._Llama import Llama
+from ._OpenAI import OpenAI
+from ._PARAMS import MODELS
+from ._Perplexity import Perplexity
 
 
 def genai_factory(

scitex/ml/activation/__init__.py

@@ -0,0 +1,8 @@
+#!/usr/bin/env python3
+"""Scitex act module."""
+
+from ._define import define
+
+__all__ = [
+    "define",
+]

scitex/ml/activation/_define.py

@@ -0,0 +1,11 @@
+import torch.nn as nn
+
+
+def define(act_str):
+    acts_dict = {
+        "relu": nn.ReLU(),
+        "swish": nn.SiLU(),
+        "mish": nn.Mish(),
+        "lrelu": nn.LeakyReLU(0.1),
+    }
+    return acts_dict[act_str]

scitex/{ai/classifier_server.py → ml/classification/Classifier.py}

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # Time-stamp: "2024-12-12 06:49:15 (ywatanabe)"
-# File: ./scitex_repo/src/scitex/ai/ClassifierServer.py
+# File: ./scitex_repo/src/scitex/ai/Classifier.py
 
 THIS_FILE = (
-    "/data/gpfs/projects/punim2354/ywatanabe/scitex_repo/src/scitex/ai/ClassifierServer.py"
+    "/data/gpfs/projects/punim2354/ywatanabe/scitex_repo/src/scitex/ai/Classifier.py"
 )
 
 """
@@ -50,13 +50,13 @@ from sklearn.svm import SVC as _SVC
 from sklearn.svm import LinearSVC as _LinearSVC
 
 
-class ClassifierServer:
+class Classifier:
     """
     Server for initializing various scikit-learn classifiers with consistent interface.
 
     Example
     -------
-    >>> clf_server = ClassifierServer(class_weight={0: 1.0, 1: 2.0}, random_state=42)
+    >>> clf_server = Classifier(class_weight={0: 1.0, 1: 2.0}, random_state=42)
     >>> clf = clf_server("SVC", scaler=_StandardScaler())
     >>> print(clf_server.list)
     ['CatBoostClassifier', 'Perceptron', ...]
@@ -127,5 +127,5 @@ class ClassifierServer:
 
 
 if __name__ == "__main__":
-    clf_server = ClassifierServer()
+    clf_server = Classifier()
     clf = clf_server("SVC", scaler=_StandardScaler())