mostlyai-engine 1.4.6__tar.gz → 1.4.8__tar.gz

{mostlyai_engine-1.4.6 → mostlyai_engine-1.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mostlyai-engine
-Version: 1.4.6
+Version: 1.4.8
 Summary: Synthetic Data Engine
 Project-URL: homepage, https://github.com/mostly-ai/mostlyai-engine
 Project-URL: repository, https://github.com/mostly-ai/mostlyai-engine

{mostlyai_engine-1.4.6 → mostlyai_engine-1.4.8}/mostlyai/engine/__init__.py

@@ -22,7 +22,7 @@ from mostlyai.engine.splitting import split
 from mostlyai.engine.training import train
 
 __all__ = ["split", "analyze", "encode", "train", "generate", "init_logging", "set_random_state"]
-__version__ = "1.4.6"
+__version__ = "1.4.8"
 
 # suppress specific warning related to os.fork() in multi-threaded processes
 warnings.filterwarnings("ignore", category=DeprecationWarning, message=".*multi-threaded.*fork.*")

{mostlyai_engine-1.4.6 → mostlyai_engine-1.4.8}/mostlyai/engine/_encoding_types/tabular/character.py

@@ -155,7 +155,7 @@ def decode_character(df_encoded: pd.DataFrame, stats: dict) -> pd.Series:
         values = values.apply(lambda item: item.replace(UNKNOWN_TOKEN, "")).str.rstrip()
     else:
         # handle de-generate case, where no tokens were stored
-        values = pd.Series(pd.NA).repeat(df_encoded.shape[0])
+        values = pd.Series(pd.NA, index=range(df_encoded.shape[0]))
     if stats["has_nan"]:
         values[df_encoded["nan"] == 1] = pd.NA
     return values

{mostlyai_engine-1.4.6 → mostlyai_engine-1.4.8}/mostlyai/engine/_language/common.py

@@ -18,7 +18,15 @@ from pathlib import Path
 
 import torch
 from peft import PeftConfig, prepare_model_for_kbit_training
-from transformers import AutoConfig, AutoModelForCausalLM, BitsAndBytesConfig, PretrainedConfig, PreTrainedModel
+from transformers import (
+    AutoConfig,
+    AutoModel,
+    AutoModelForCausalLM,
+    AutoModelForImageTextToText,
+    BitsAndBytesConfig,
+    PretrainedConfig,
+    PreTrainedModel,
+)
 
 from mostlyai.engine._language.lstm import LSTMFromScratchConfig
 
@@ -35,7 +43,7 @@ def is_bf16_supported(device: torch.device) -> bool:
 
 
 def get_attention_implementation(config: PretrainedConfig) -> str | None:
-    model_cls = AutoModelForCausalLM._model_mapping[type(config)]
+    model_cls = AutoModel._model_mapping[type(config)]
     attn_implementation = None
     if getattr(model_cls, "_supports_sdpa", False):
         attn_implementation = "sdpa"
@@ -91,13 +99,23 @@ def load_base_model_and_config(
     else:
         device_map = "auto"
 
-    model = AutoModelForCausalLM.from_pretrained(
+    if hasattr(config, "text_config") and hasattr(config, "vision_config"):
+        config.text_config.use_cache = use_cache
+        config.text_config.attn_implementation = attn_implementation
+        auto_model_cls = AutoModelForImageTextToText
+    elif hasattr(config, "use_cache"):
+        config.use_cache = use_cache
+        config.attn_implementation = attn_implementation
+        auto_model_cls = AutoModelForCausalLM
+    else:
+        raise ValueError("Unsupported model")
+
+    model = auto_model_cls.from_pretrained(
         model_id_or_path,
-        torch_dtype=torch_dtype,
-        attn_implementation=attn_implementation,
-        use_cache=use_cache,
+        config=config,
         device_map=device_map,
         quantization_config=quantization_config,
+        torch_dtype=torch_dtype,
     )
     if quantization_config:
         # convert all non-kbit layers to float32

{mostlyai_engine-1.4.6 → mostlyai_engine-1.4.8}/mostlyai/engine/_language/generation.py

@@ -256,9 +256,6 @@ def generate(
         _LOG.info(f"{max_new_tokens=}")
 
         t0 = time.time()
-        # use MOSTLY_HUGGING_FACE_TOKEN if available, otherwise HF_TOKEN should be unset or with a pre-set value as is
-        if os.getenv("MOSTLY_HUGGING_FACE_TOKEN"):
-            os.environ["HF_TOKEN"] = os.environ["MOSTLY_HUGGING_FACE_TOKEN"]
 
         is_peft_adapter = (workspace.model_path / "adapter_config.json").exists()
         is_vllm_available = importlib.util.find_spec("vllm") is not None

{mostlyai_engine-1.4.6 → mostlyai_engine-1.4.8}/mostlyai/engine/_language/training.py

@@ -16,7 +16,6 @@ import gc
 import json
 import logging
 import math
-import os
 import time
 import warnings
 from collections.abc import Callable
@@ -465,10 +464,6 @@ def train(
                 model_config = LSTMFromScratchConfig(vocab_size=len(tokenizer), with_dp=with_dp)
                 model = LSTMFromScratchLMHeadModel(model_config).to(device)
         else:
-            # use MOSTLY_HUGGING_FACE_TOKEN if available
-            if os.getenv("MOSTLY_HUGGING_FACE_TOKEN"):
-                os.environ["HF_TOKEN"] = os.environ["MOSTLY_HUGGING_FACE_TOKEN"]
-
             model, model_config = load_base_model_and_config(
                 model_id_or_path,
                 device=device,

{mostlyai_engine-1.4.6 → mostlyai_engine-1.4.8}/mostlyai/engine/_tabular/generation.py

@@ -758,15 +758,7 @@ def generate(
         _LOG.info(f"{gen_column_order=}")
         if not enable_flexible_generation:
             # check if resolved column order is the same as the one from training
-            trn_column_order = [SLEN_SIDX_SDEC_COLUMN] if is_sequential else []
-            trn_column_order += [
-                get_argn_name(
-                    argn_processor=tgt_stats["columns"][col][ARGN_PROCESSOR],
-                    argn_table=tgt_stats["columns"][col][ARGN_TABLE],
-                    argn_column=tgt_stats["columns"][col][ARGN_COLUMN],
-                )
-                for col in tgt_stats["columns"].keys()
-            ]
+            trn_column_order = get_columns_from_cardinalities(tgt_cardinalities)
             _LOG.info(f"{trn_column_order=}")
             if gen_column_order != trn_column_order:
                 raise ValueError(

{mostlyai_engine-1.4.6 → mostlyai_engine-1.4.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mostlyai-engine"
-version = "1.4.6"
+version = "1.4.8"
 description = "Synthetic Data Engine"
 authors = [{ name = "MOSTLY AI", email = "dev@mostly.ai" }]
 requires-python = ">=3.10"