PraisonAI 0.0.59rc9__cp312-cp312-manylinux_2_35_x86_64.whl → 0.0.61__cp312-cp312-manylinux_2_35_x86_64.whl

praisonai/cli.py

@@ -12,6 +12,7 @@ import argparse
 from .auto import AutoGenerator
 from .agents_generator import AgentsGenerator
 from .inbuilt_tools import *
+from .inc.config import generate_config
 import shutil
 import subprocess
 import logging
@@ -130,17 +131,26 @@ class PraisonAI:
         
         if args.agent_file == 'train':
             package_root = os.path.dirname(os.path.abspath(__file__))
-            config_yaml_source = os.path.join(package_root, 'setup', 'config.yaml')
             config_yaml_destination = os.path.join(os.getcwd(), 'config.yaml')
 
-            if not os.path.exists(config_yaml_destination):
-                try:
-                    shutil.copyfile(config_yaml_source, config_yaml_destination)
-                    print("config.yaml copied to the current directory.")
-                except FileExistsError:
-                    print("config.yaml already exists in the current directory. Skipping copy.")
-            else:
-                print("config.yaml already exists in the current directory. Skipping copy.")
+            # Create config.yaml only if it doesn't exist or --model or --dataset is provided
+            if not os.path.exists(config_yaml_destination) or args.model or args.dataset:
+                config = generate_config(
+                    model_name=args.model,
+                    hf_model_name=args.hf,
+                    ollama_model_name=args.ollama,
+                    dataset=[{
+                        "name": args.dataset
+                    }]
+                )
+                with open('config.yaml', 'w') as f:
+                    yaml.dump(config, f, default_flow_style=False, indent=2) 
+
+            # Overwrite huggingface_save and ollama_save if --hf or --ollama are provided 
+            if args.hf:
+                config["huggingface_save"] = "true"
+            if args.ollama:
+                config["ollama_save"] = "true"
 
             if 'init' in sys.argv:
                 from praisonai.setup.setup_conda_env import main as setup_conda_main
@@ -150,12 +160,12 @@ class PraisonAI:
 
             try:
                 result = subprocess.check_output(['conda', 'env', 'list'])
-                if 'prasion_env' in result.decode('utf-8'):
-                    print("Conda environment 'prasion_env' found.")
+                if 'praison_env' in result.decode('utf-8'):
+                    print("Conda environment 'praison_env' found.")
                 else:
                     raise subprocess.CalledProcessError(1, 'grep')
             except subprocess.CalledProcessError:
-                print("Conda environment 'prasion_env' not found. Setting it up...")
+                print("Conda environment 'praison_env' not found. Setting it up...")
                 from praisonai.setup.setup_conda_env import main as setup_conda_main
                 setup_conda_main()
                 print("All packages installed.")
@@ -167,7 +177,7 @@ class PraisonAI:
             env = os.environ.copy()
             env['PYTHONUNBUFFERED'] = '1'
             
-            stream_subprocess(['conda', 'run', '--no-capture-output', '--name', 'prasion_env', 'python', '-u', train_script_path, 'train'] + train_args, env=env)
+            stream_subprocess(['conda', 'run', '--no-capture-output', '--name', 'praison_env', 'python', '-u', train_script_path, 'train'], env=env)
             return
         
         invocation_cmd = "praisonai"
@@ -240,7 +250,11 @@ class PraisonAI:
         parser.add_argument("--auto", nargs=argparse.REMAINDER, help="Enable auto mode and pass arguments for it")
         parser.add_argument("--init", nargs=argparse.REMAINDER, help="Enable auto mode and pass arguments for it")
         parser.add_argument("agent_file", nargs="?", help="Specify the agent file")
-        parser.add_argument("--deploy", action="store_true", help="Deploy the application")  # New argument
+        parser.add_argument("--deploy", action="store_true", help="Deploy the application") 
+        parser.add_argument("--model", type=str, help="Model name")
+        parser.add_argument("--hf", type=str, help="Hugging Face model name")
+        parser.add_argument("--ollama", type=str, help="Ollama model name")
+        parser.add_argument("--dataset", type=str, help="Dataset name for training", default="yahma/alpaca-cleaned")
         args, unknown_args = parser.parse_known_args()
 
         if unknown_args and unknown_args[0] == '-b' and unknown_args[1] == 'api:app':

praisonai/deploy.py

@@ -56,7 +56,7 @@ class CloudDeployer:
             file.write("FROM python:3.11-slim\n")
             file.write("WORKDIR /app\n")
             file.write("COPY . .\n")
-            file.write("RUN pip install flask praisonai==0.0.59rc9 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==0.0.61 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

praisonai/inc/config.py

@@ -0,0 +1,96 @@
+def generate_config(
+    ollama_save=None,
+    huggingface_save=None,
+    train=None,
+    model_name=None,
+    hf_model_name=None,
+    ollama_model_name=None,
+    model_parameters=None,
+    max_seq_length=None,
+    load_in_4bit=None,
+    lora_r=None,
+    lora_target_modules=None,
+    lora_alpha=None,
+    lora_dropout=None,
+    lora_bias=None,
+    use_gradient_checkpointing=None,
+    random_state=None,
+    use_rslora=None,
+    loftq_config=None,
+    dataset=None,
+    dataset_text_field=None,
+    dataset_num_proc=None,
+    packing=None,
+    per_device_train_batch_size=None,
+    gradient_accumulation_steps=None,
+    warmup_steps=None,
+    num_train_epochs=None,
+    max_steps=None,
+    learning_rate=None,
+    logging_steps=None,
+    optim=None,
+    weight_decay=None,
+    lr_scheduler_type=None,
+    seed=None,
+    output_dir=None,
+    quantization_method=None
+):
+    """Generates the configuration for PraisonAI with dynamic overrides."""
+
+    config = {
+        "ollama_save": ollama_save or "true",
+        "huggingface_save": huggingface_save or "true",
+        "train": train or "true",
+
+        "model_name": model_name or "unsloth/Meta-Llama-3.1-8B-Instruct-bnb-4bit",
+        "hf_model_name": hf_model_name or "mervinpraison/llama-3.1-tamilan-8B-test",
+        "ollama_model": ollama_model_name or "mervinpraison/llama3.1-tamilan-test",
+        "model_parameters": model_parameters or "8b",
+
+        "dataset": dataset or [
+            {
+                "name": "yahma/alpaca-cleaned",
+                "split_type": "train",
+                "processing_func": "format_prompts",
+                "rename": {"input": "input", "output": "output", "instruction": "instruction"},
+                "filter_data": False,
+                "filter_column_value": "id",
+                "filter_value": "alpaca",
+                "num_samples": 20000
+            }
+        ],
+
+        "dataset_text_field": dataset_text_field or "text",
+        "dataset_num_proc": dataset_num_proc or 2,
+        "packing": packing or False,
+
+        "max_seq_length": max_seq_length or 2048,
+        "load_in_4bit": load_in_4bit or True,
+        "lora_r": lora_r or 16,
+        "lora_target_modules": lora_target_modules or [
+            "q_proj", "k_proj", "v_proj", "o_proj", "gate_proj", "up_proj", "down_proj"
+        ],
+        "lora_alpha": lora_alpha or 16,
+        "lora_dropout": lora_dropout or 0,
+        "lora_bias": lora_bias or "none",
+        "use_gradient_checkpointing": use_gradient_checkpointing or "unsloth",
+        "random_state": random_state or 3407,
+        "use_rslora": use_rslora or False,
+        "loftq_config": loftq_config or None,
+
+        "per_device_train_batch_size": per_device_train_batch_size or 2,
+        "gradient_accumulation_steps": gradient_accumulation_steps or 2,
+        "warmup_steps": warmup_steps or 5,
+        "num_train_epochs": num_train_epochs or 1,
+        "max_steps": max_steps or 10,
+        "learning_rate": learning_rate or 2.0e-4,
+        "logging_steps": logging_steps or 1,
+        "optim": optim or "adamw_8bit",
+        "weight_decay": weight_decay or 0.01,
+        "lr_scheduler_type": lr_scheduler_type or "linear",
+        "seed": seed or 3407,
+        "output_dir": output_dir or "outputs",
+
+        "quantization_method": quantization_method or ["q4_k_m"]
+    }
+    return config

praisonai/setup/config.yaml

@@ -1,9 +1,16 @@
+ollama_save: "true"
+huggingface_save: "true"
+train: "true"
+
 model_name: "unsloth/Meta-Llama-3.1-8B-Instruct-bnb-4bit"
 hf_model_name: "mervinpraison/llama-3.1-tamilan-8B-test"
+ollama_model: "mervinpraison/llama3.1-tamilan-test"
+model_parameters: "8b"
+
 max_seq_length: 2048
 load_in_4bit: true
 lora_r: 16
-lora_target_modules: 
+lora_target_modules:
   - "q_proj"
   - "k_proj"
   - "v_proj"
@@ -50,7 +57,4 @@ seed: 3407
 output_dir: "outputs"
 
 quantization_method: 
-  - "q4_k_m"
-
-ollama_model: "llama3.1-tamilan-test"
-model_parameters: "8b"
+  - "q4_k_m"

praisonai/setup/setup_conda_env.sh

@@ -33,7 +33,7 @@ else
 fi
 
 # Create and activate the Conda environment
-ENV_NAME="prasion_env"
+ENV_NAME="praison_env"
 if conda info --envs | grep -q $ENV_NAME; then
     echo "Environment $ENV_NAME already exists. Recreating..."
     conda env remove -y -n $ENV_NAME  # Remove existing environment

praisonai/train.py

@@ -142,6 +142,8 @@ class train:
             ),
         )
         trainer.train()
+        self.model.save_pretrained("lora_model") # Local saving
+        self.tokenizer.save_pretrained("lora_model")
 
     def inference(self, instruction, input_text):
         FastLanguageModel.for_inference(self.model)
@@ -158,6 +160,17 @@ class train:
         inputs = self.tokenizer([alpaca_prompt.format(instruction, input_text, "")], return_tensors="pt").to("cuda")
         outputs = self.model.generate(**inputs, max_new_tokens=64, use_cache=True)
         print(self.tokenizer.batch_decode(outputs))
+        
+    def load_model(self):
+        """Loads the model and tokenizer using the FastLanguageModel library."""
+        from unsloth import FastLanguageModel
+        model, tokenizer = FastLanguageModel.from_pretrained(
+            model_name=self.config["output_dir"],
+            max_seq_length=2048,
+            dtype=None,
+            load_in_4bit=self.config["load_in_4bit"],
+        )
+        return model, tokenizer
 
     def save_model_merged(self):
         if os.path.exists(self.config["hf_model_name"]):
@@ -176,9 +189,22 @@ class train:
             quantization_method=self.config["quantization_method"],
             token=os.getenv('HF_TOKEN')
         )
+    
+    def save_model_gguf(self):
+        self.model.save_pretrained_gguf(
+            self.config["hf_model_name"],
+            self.tokenizer,
+            quantization_method="q4_k_m"
+        )
 
     def prepare_modelfile_content(self):
         output_model = self.config["hf_model_name"]
+        gguf_path = f"{output_model}/unsloth.Q4_K_M.gguf"
+
+        # Check if the GGUF file exists. If not, generate it ## TODO Multiple Quantisation other than Q4_K_M.gguf
+        if not os.path.exists(gguf_path):
+            self.model, self.tokenizer = self.load_model()
+            self.save_model_gguf()
         return f"""FROM {output_model}/unsloth.Q4_K_M.gguf
 
 TEMPLATE \"\"\"Below are some instructions that describe some tasks. Write responses that appropriately complete each request.{{{{ if .Prompt }}}}
@@ -210,11 +236,28 @@ PARAMETER stop "<|reserved_special_token_"
         self.check_gpu()
         self.check_ram()
         # self.install_packages()
-        self.prepare_model()
-        self.train_model()
-        self.save_model_merged()
-        self.push_model_gguf()
-        self.create_and_push_ollama_model()
+        if self.config.get("train", "true").lower() == "true":
+            self.prepare_model()
+            self.train_model()
+
+        if self.config.get("huggingface_save", "true").lower() == "true":
+            # self.model, self.tokenizer = self.load_model()
+            self.save_model_merged()
+
+        if self.config.get("huggingface_save_gguf", "true").lower() == "true":
+            # self.model, self.tokenizer = self.load_model()
+            self.push_model_gguf()
+            
+        # if self.config.get("save_gguf", "true").lower() == "true": ## TODO
+        #     self.model, self.tokenizer = self.load_model()
+        #     self.save_model_gguf()
+        
+        # if self.config.get("save_merged", "true").lower() == "true": ## TODO
+        #     self.model, self.tokenizer = self.load_model()
+        #     self.save_model_merged()
+
+        if self.config.get("ollama_save", "true").lower() == "true":
+            self.create_and_push_ollama_model()
 
 
 def main():

{praisonai-0.0.59rc9.dist-info → praisonai-0.0.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.0.59rc9
+Version: 0.0.61
 Summary: PraisonAI application combines AutoGen and CrewAI or similar frameworks into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customization, and efficient human-agent collaboration.
 Author: Mervin Praison
 Requires-Python: >=3.10,<3.13

{praisonai-0.0.59rc9.dist-info → praisonai-0.0.61.dist-info}/RECORD

@@ -3,11 +3,12 @@ praisonai/__main__.py,sha256=MVgsjMThjBexHt4nhd760JCqvP4x0IQcwo8kULOK4FQ,144
 praisonai/agents_generator.py,sha256=8d1WRbubvEkBrW1HZ7_xnGyqgJi0yxmXa3MgTIqef1c,19127
 praisonai/auto.py,sha256=9spTXqj47Hmmqv5QHRYE_RzSVHH_KoPbaZjskUj2UcE,7895
 praisonai/chainlit_ui.py,sha256=bNR7s509lp0I9JlJNvwCZRUZosC64qdvlFCt8NmFamQ,12216
-praisonai/cli.py,sha256=WQf6NG1xEcyE9ySR4ahSiVDxCkedGV6A0Yaf78uYXQ0,17411
-praisonai/deploy.py,sha256=_jT6RcTHzxeWKtizSyaGmfE48FKbvw___CHn6jOuWnc,6031
+praisonai/cli.py,sha256=ZDQF9OXgaquu_89cLc-jsx5D9zWxYg4ChPhlVv66drk,18047
+praisonai/deploy.py,sha256=JQ8FsfDYeZ310dSmOAHGfgI0wFjqPK45BrcLrRUOgBw,6028
 praisonai/inbuilt_tools/__init__.py,sha256=mUKnbL6Gram9c9f2m8wJwEzURBLmPEOcHzwySBH89YA,74
 praisonai/inbuilt_tools/autogen_tools.py,sha256=svYkM2N7DVFvbiwgoAS7U_MqTOD8rHf8VD3BaFUV5_Y,14907
 praisonai/inc/__init__.py,sha256=sPDlYBBwdk0VlWzaaM_lG0_LD07lS2HRGvPdxXJFiYg,62
+praisonai/inc/config.py,sha256=up2-841ruK7MCUUT3xkWBA5S6WsY0sFODNfcT6Q4Wms,3333
 praisonai/inc/models.py,sha256=1kwP9o56AvN8L38x7eeAzudjAvstN0uWu-woQkgxAe4,5449
 praisonai/public/android-chrome-192x192.png,sha256=ENJEqhDE3XEQViRhKNDezQKRiOiuHOUj5nzRN43fz50,6535
 praisonai/public/android-chrome-512x512.png,sha256=4txEwB0cJkxFVarRdvFGJZR1DtWJ2h-L_2cUEjBXHAc,15244
@@ -23,12 +24,12 @@ praisonai/public/movie.svg,sha256=aJ2EQ8vXZusVsF2SeuAVxP4RFJzQ14T26ejrGYdBgzk,12
 praisonai/public/thriller.svg,sha256=2dYY72EcgbEyTxS4QzjAm37Y4srtPWEW4vCMFki98ZI,3163
 praisonai/setup/__init__.py  ,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 praisonai/setup/build.py,sha256=NyTAXQ_UZ8vKo_KwCINp8ctmauZyCMDkw1rys3ay0ec,646
-praisonai/setup/config.yaml,sha256=DbfEJyvWTDACScH9XquGGsNYcyudpEwpawd_rgaPN98,1138
+praisonai/setup/config.yaml,sha256=sr_D1RIvv3LQ_eueOMZV0rAUiWTR-n2xuE1RhKK6b34,1211
 praisonai/setup/post_install.py,sha256=hXukn_7bL64vE582SZcS-9MiZGeJj6hN7upoR1oJ-Bo,576
 praisonai/setup/setup_conda_env.py,sha256=4QiWrqgEObivzOMwfJgWaCPpUEpB68cQ6lFwVwFoufk,816
-praisonai/setup/setup_conda_env.sh,sha256=Ao5kCgIVamCcCKhrXWYELTUr5fQlRQmWwDYjuTxBH6s,2718
+praisonai/setup/setup_conda_env.sh,sha256=te7s0KHsTi7XM-vkNvE0dKC1HeU2tXxqE-sPUScV6fY,2718
 praisonai/test.py,sha256=OL-wesjA5JTohr8rtr6kWoaS4ImkJg2l0GXJ-dUUfRU,4090
-praisonai/train.py,sha256=M2rpBca3k4uQvmoKh-0r_2MTlWLYL7ffKMtlU8hF7k8,9214
+praisonai/train.py,sha256=DvORlrwKOD-2v4r_z84eV3LsfzpNs-WnPKb5cQB3_t4,11071
 praisonai/ui/chat.py,sha256=B4F1R7qP-0c-elg8WcRsYlr6-FkmHWtdunGIzU7WrDM,9321
 praisonai/ui/code.py,sha256=GcOr8lNah4AgI2RcIKmgjehzSl-KNu7x6UHrghixeaM,10095
 praisonai/ui/context.py,sha256=oWO2I_WBZb7kZnuXItf18EJX0ZQv-1nAd8rxhwhuuDU,11871
@@ -40,8 +41,8 @@ praisonai/ui/public/movie.svg,sha256=aJ2EQ8vXZusVsF2SeuAVxP4RFJzQ14T26ejrGYdBgzk
 praisonai/ui/public/thriller.svg,sha256=2dYY72EcgbEyTxS4QzjAm37Y4srtPWEW4vCMFki98ZI,3163
 praisonai/ui/sql_alchemy.py,sha256=HsyeRq-G9qbQobHWpTJHHKQiT4FvYw_7iuv-2PNh0IU,27419
 praisonai/version.py,sha256=ugyuFliEqtAwQmH4sTlc16YXKYbFWDmfyk87fErB8-8,21
-praisonai-0.0.59rc9.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
-praisonai-0.0.59rc9.dist-info/METADATA,sha256=UwVe6VMWXUoygLpeg695CvLu9vK_ikjQ0L-eZ1AE7RM,11151
-praisonai-0.0.59rc9.dist-info/WHEEL,sha256=HBsDV7Hj4OTiS1GX6ua7iQXUQTB9UHftbBxr7Q8Xm9c,110
-praisonai-0.0.59rc9.dist-info/entry_points.txt,sha256=jB078LEGLY3Ky_indhclomRIVVpXrPSksHjJ-tcBZ-o,133
-praisonai-0.0.59rc9.dist-info/RECORD,,
+praisonai-0.0.61.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
+praisonai-0.0.61.dist-info/METADATA,sha256=M-MbTL30aaXFUXZ5M42Gxhcu478_Gl9MfdiZLgnb5jI,11148
+praisonai-0.0.61.dist-info/WHEEL,sha256=HBsDV7Hj4OTiS1GX6ua7iQXUQTB9UHftbBxr7Q8Xm9c,110
+praisonai-0.0.61.dist-info/entry_points.txt,sha256=jB078LEGLY3Ky_indhclomRIVVpXrPSksHjJ-tcBZ-o,133
+praisonai-0.0.61.dist-info/RECORD,,