janito 3.13.3__py3-none-any.whl → 3.14.1__py3-none-any.whl

janito/cli/main_cli.py

@@ -173,7 +173,7 @@ definition = [
         },
     ),
     (["-p", "--provider"], {"metavar": "PROVIDER", "help": "Select the provider"}),
-    (["-m", "--model"], {"metavar": "MODEL", "help": "Select the model"}),
+    (["-m", "--model"], {"metavar": "MODEL", "help": "Select the model (can use model@provider syntax)"}),
     (
         ["-t", "--temperature"],
         {"type": float, "default": None, "help": "Set the temperature"},
@@ -304,11 +304,13 @@ class JanitoCLI:
 
         self.parser = argparse.ArgumentParser(
             description="Janito CLI - A tool for running LLM-powered workflows from the command line."
-            "\n\nExample usage: janito -p moonshot -m kimi-k1-8k 'Your prompt here'\n\n"
+            "\n\nExample usage: janito -p moonshot -m kimi-k1-8k 'Your prompt here'\n"
+            "Example usage: janito -m model@provider 'Your prompt here'\n\n"
             "Use -m or --model to set the model for the session.",
         )
         self._define_args()
         self.args = self.parser.parse_args()
+        self._parse_model_provider_syntax()
         self._set_all_arg_defaults()
         # Support custom config file via -c/--config
         if getattr(self.args, "config", None):
@@ -349,6 +351,18 @@ class JanitoCLI:
 
         self.rich_reporter = RichTerminalReporter(raw_mode=self.args.raw)
 
+    def _parse_model_provider_syntax(self):
+        """Parse -m model@provider syntax to split into model and provider."""
+        model = getattr(self.args, "model", None)
+        if model and "@" in model:
+            model_part, provider_part = model.rsplit("@", 1)
+            if model_part and provider_part:
+                # Only set provider if not already explicitly set via -p flag
+                if getattr(self.args, "provider", None) is None:
+                    self.args.provider = provider_part
+                # Always set the model part (without the @provider suffix)
+                self.args.model = model_part
+
     def _define_args(self):
         for argnames, argkwargs in definition:
             # Patch version argument dynamically with real version

janito/docs/GETTING_STARTED.md

@@ -57,6 +57,9 @@ janito --set-config ibm project_id YOUR_PROJECT_ID
 
 # Verify it's working
 janito "Hello, can you introduce yourself?"
+
+# Or use the shorthand syntax
+janito -m ibm/granite-3-3-8b-instruct@ibm "Hello, can you introduce yourself?"
 ```
 
 ## Your First Commands
@@ -69,6 +72,10 @@ janito "Create a Python script to calculate fibonacci numbers"
 # With specific model
 janito -m kimi-k1-8k "Explain machine learning in simple terms"
 
+# Using model@provider syntax (shorthand)
+janito -m kimi-k1-8k@moonshot "Explain machine learning in simple terms"
+janito -m gpt-4@openai "Explain quantum computing"
+
 # Interactive chat mode
 janito --chat
 ```

janito/providers/alibaba/model_info.py

@@ -133,4 +133,24 @@ MODEL_SPECS = {
         thinking=False,
         max_cot=65536,
     ),
+    "qwen-omni-turbo": LLMModelInfo(
+        name="qwen-omni-turbo",
+        context=32768,
+        max_response=2048,
+        category="Alibaba Qwen Omni Turbo Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=False,
+        thinking=False,
+        max_cot=2048,
+    ),
+    "qwen3-coder-flash": LLMModelInfo(
+        name="qwen3-coder-flash",
+        context=1000000,
+        max_response=65536,
+        category="Alibaba Qwen3 Coder Flash Model (OpenAI-compatible)",
+        driver="OpenAIModelDriver",
+        thinking_supported=True,
+        thinking=False,
+        max_cot=65536,
+    ),
 }

{janito-3.13.3.dist-info → janito-3.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 3.13.3
+Version: 3.14.1
 Summary: A new Python package called janito.
 Author-email: João Pinto <janito@ikignosis.org>
 Project-URL: Homepage, https://github.com/ikignosis/janito

{janito-3.13.3.dist-info → janito-3.14.1.dist-info}/RECORD

@@ -30,7 +30,7 @@ janito/cli/__init__.py,sha256=xaPDOrWphBbCR63Xpcx_yfpXSJIlCaaICc4j2qpWqrM,194
 janito/cli/config.py,sha256=HkZ14701HzIqrvaNyDcDhGlVHfpX_uHlLp2rHmhRm_k,872
 janito/cli/console.py,sha256=dWOa6mbfCQd46wVwwZfeYBxroCxdqvnAZQQ80j89qYA,70
 janito/cli/main.py,sha256=s5odou0txf8pzTf1ADk2yV7T5m8B6cejJ81e7iu776U,312
-janito/cli/main_cli.py,sha256=TKLbKG1R-BbvzxIp2MphBQg7kKxkj4QF5TZrxnjn1xk,16420
+janito/cli/main_cli.py,sha256=JaZUedhNdeNRaYU5j2bH0u1dD8B89olk3ZSx1_REQjI,17204
 janito/cli/prompt_core.py,sha256=x1RcX1p4wCL4YzXS76T6BZ8nt5cGiXCAB3QOlC6BJQQ,14937
 janito/cli/prompt_handler.py,sha256=SnPTlL64noeAMGlI08VBDD5IDD8jlVMIYA4-fS8zVLg,215
 janito/cli/prompt_setup.py,sha256=s48gvNfZhKjsEhf4EzL1tKIGm4wDidPMDvlM6TAPYes,2116
@@ -104,7 +104,7 @@ janito/cli/core/setters.py,sha256=zjSUxy6iUzcrmEunFk7dA90KqbMaq2O7LTGP8wn2HxA,53
 janito/cli/core/unsetters.py,sha256=FEw9gCt0vRvoCt0kRSNfVB2tzi_TqppJIx2nHPP59-k,2012
 janito/cli/single_shot_mode/__init__.py,sha256=Ct99pKe9tINzVW6oedZJfzfZQKWpXz-weSSCn0hrwHY,115
 janito/cli/single_shot_mode/handler.py,sha256=2sIX2hmX_FRCLI4NkPPABOpMegI0YokjelHQ20f_YG8,6129
-janito/docs/GETTING_STARTED.md,sha256=IrTTa9tBTGDBw9EQJs0J05EdzjBCcwUd04jI-gswdSc,4774
+janito/docs/GETTING_STARTED.md,sha256=iVg8wNpegqEaIYFqanHNQpPwrA-ytflfcplPR3SlSKQ,5051
 janito/drivers/dashscope.bak.zip,sha256=9Pv4Xyciju8jO1lEMFVgYXexoZkxmDO3Ig6vw3ODfL8,4936
 janito/drivers/openai_responses.bak.zip,sha256=E43eDCHGa2tCtdjzj_pMnWDdnsOZzj8BJTR5tJp8wcM,13352
 janito/drivers/azure_openai/driver.py,sha256=V_Dmwv6TzCoH6uzH_zIVUlodYfCo6YkCCjQz-jK2Zhg,4101
@@ -206,7 +206,7 @@ janito/providers/__init__.py,sha256=LNF-KSuO7YyPMoRQNU6_ejxQAPAVeznsXXTTFvU44ag,
 janito/providers/dashscope.bak.zip,sha256=BwXxRmZreEivvRtmqbr5BR62IFVlNjAf4y6DrF2BVJo,5998
 janito/providers/registry.py,sha256=Ygwv9eVrTXOKhv0EKxSWQXO5WMHvajWE2Q_Lc3p7dKo,730
 janito/providers/alibaba/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-janito/providers/alibaba/model_info.py,sha256=A1DL-NCFC6WhEirSfOHTXeFT14pSPvLRbV_DCbaO4jo,4893
+janito/providers/alibaba/model_info.py,sha256=XNDDEH9g7gsllizel3VhmWeHrIt75PVQ43zrcluKF3A,5526
 janito/providers/alibaba/provider.py,sha256=HhDtHk6F7HW_KBhX5ixtJlKmS3ELZc3G7aYr0qeqS5k,3483
 janito/providers/anthropic/model_info.py,sha256=m6pBh0Ia8_xC1KZ7ke_4HeHIFw7nWjnYVItnRpkCSWc,1206
 janito/providers/anthropic/provider.py,sha256=x_aAP7dJ64rXk6ZbzjcF8VH8y8JV9Bko_Yx5SXjPLwc,2810
@@ -266,9 +266,9 @@ janito/tools/tool_utils.py,sha256=alPm9DvtXSw_zPRKvP5GjbebPRf_nfvmWk2TNlL5Cws,12
 janito/tools/tools_adapter.py,sha256=3Phjw34mOqG0KvXzQpZKIWigfSgZWRvdYuSdvV7Dj4M,21965
 janito/tools/tools_schema.py,sha256=rGrKrmpPNR07VXHAJ_haGBRRO-YGLOF51BlYRep9AAQ,4415
 janito/tools/url_whitelist.py,sha256=0CPLkHTp5HgnwgjxwgXnJmwPeZQ30q4j3YjW59hiUUE,4295
-janito-3.13.3.dist-info/licenses/LICENSE,sha256=dXV4fOF2ZErugtN8l_Nrj5tsRTYgtjE3cgiya0UfBio,11356
-janito-3.13.3.dist-info/METADATA,sha256=-aSTjP_h0DxPcYKQvkombtPpfP6n_ymmOtKymWBf_jw,2330
-janito-3.13.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-janito-3.13.3.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
-janito-3.13.3.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
-janito-3.13.3.dist-info/RECORD,,
+janito-3.14.1.dist-info/licenses/LICENSE,sha256=dXV4fOF2ZErugtN8l_Nrj5tsRTYgtjE3cgiya0UfBio,11356
+janito-3.14.1.dist-info/METADATA,sha256=TJmpXIzejkim3JjOP_gSv5hCvyRBxL0wCOdR0QohbIk,2330
+janito-3.14.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+janito-3.14.1.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
+janito-3.14.1.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
+janito-3.14.1.dist-info/RECORD,,