chore: add stringify! and remove redundant macro inputs

Author: surafelfikru

src/providers/PROVIDERS.md

@@ -16,10 +16,8 @@ crate::openai_compatible_provider!(
     AmazonBedrock,
     AmazonBedrockBuilder,
     AmazonBedrockProviderSettings,
-    "Amazon Bedrock",
-    "anthropic.claude-3-5-sonnet-20241022-v2:0",
-    "anthropic_claude_3_5_sonnet_v1_0()"
+    "anthropic.claude-3-5-sonnet-20241022-v2:0"
 );
 
 // Generate the language model implementation
-crate::openai_compatible_language_model!(AmazonBedrock, "Amazon Bedrock");
+crate::openai_compatible_language_model!(AmazonBedrock);

src/providers/amazon_bedrock/mod.rs

@@ -16,10 +16,8 @@ crate::openai_compatible_provider!(
     DeepSeek,
     DeepSeekBuilder,
     DeepSeekProviderSettings,
-    "DeepSeek",
-    "deepseek-chat",
-    "deepseek_chat()"
+    "deepseek-chat"
 );
 
 // Generate the language model implementation
-crate::openai_compatible_language_model!(DeepSeek, "DeepSeek");
+crate::openai_compatible_language_model!(DeepSeek);

src/providers/deepseek/mod.rs

@@ -16,10 +16,8 @@ crate::openai_compatible_provider!(
     Groq,
     GroqBuilder,
     GroqProviderSettings,
-    "Groq",
-    "llama-3.3-70b-specdec",
-    "llama_3_3_70b_spec_dec()"
+    "llama-3.3-70b-specdec"
 );
 
 // Generate the language model implementation
-crate::openai_compatible_language_model!(Groq, "Groq");
+crate::openai_compatible_language_model!(Groq);

src/providers/groq/mod.rs

@@ -16,10 +16,8 @@ crate::openai_compatible_provider!(
     Mistral,
     MistralBuilder,
     MistralProviderSettings,
-    "Mistral",
-    "mistral-large",
-    "mistral_large()"
+    "mistral-large"
 );
 
 // Generate the language model implementation
-crate::openai_compatible_language_model!(Mistral, "Mistral");
+crate::openai_compatible_language_model!(Mistral);

src/providers/mistral/mod.rs

@@ -64,10 +64,9 @@ macro_rules! openai_compatible_settings {
 /// # Arguments
 ///
 /// * `$provider_struct` - The name of the provider struct (e.g., `DeepSeek`)
-/// * `$provider_display_name` - Display name for the provider (e.g., `"DeepSeek"`)
 #[macro_export]
 macro_rules! openai_compatible_language_model {
-    ($provider_struct:ident, $provider_display_name:literal) => {
+    ($provider_struct:ident) => {
         pub mod language_model {
             //! Language model implementation for this provider.
 
@@ -90,15 +89,15 @@ macro_rules! openai_compatible_language_model {
                     self.inner.name()
                 }
 
-                #[doc = concat!("Generates text using the ", $provider_display_name, " provider.")]
+                #[doc = concat!("Generates text using the ", stringify!($provider_struct), " provider.")]
                 async fn generate_text(
                     &mut self,
                     options: LanguageModelOptions,
                 ) -> Result<LanguageModelResponse> {
                     self.inner.generate_text(options).await
                 }
 
-                #[doc = concat!("Streams text using the ", $provider_display_name, " provider.")]
+                #[doc = concat!("Streams text using the ", stringify!($provider_struct), " provider.")]
                 async fn stream_text(
                     &mut self,
                     options: LanguageModelOptions,
@@ -115,10 +114,9 @@ macro_rules! openai_compatible_language_model {
 /// # Arguments
 ///
 /// * `$provider_struct` - The name of the provider struct (e.g., `OpenRouter`)
-/// * `$provider_display_name` - Display name for the provider (e.g., `"OpenRouter"`)
 #[macro_export]
 macro_rules! openai_compatible_embedding_model {
-    ($provider_struct:ident, $provider_display_name:literal) => {
+    ($provider_struct:ident) => {
         pub mod embedding_model {
             //! Embedding model implementation for this provider.
 
@@ -156,18 +154,14 @@ macro_rules! openai_compatible_embedding_model {
 /// * `$provider_struct` - The name of the provider struct (e.g., `DeepSeek`)
 /// * `$builder_struct` - The name of the builder struct (e.g., `DeepSeekBuilder`)
 /// * `$settings_struct` - The name of the settings struct (e.g., `DeepSeekProviderSettings`)
-/// * `$provider_display_name` - Display name for the provider (e.g., `"DeepSeek"`)
 /// * `$example_model` - Example model identifier for docs (e.g., `"deepseek-chat"`)
-/// * `$example_method` - Example constructor method for docs (e.g., `"deepseek_chat()"`)
 #[macro_export]
 macro_rules! openai_compatible_provider {
     (
         $provider_struct:ident,
         $builder_struct:ident,
         $settings_struct:ident,
-        $provider_display_name:literal,
-        $example_model:literal,
-        $example_method:literal
+        $example_model:literal
     ) => {
         use $crate::Error;
         use $crate::core::DynamicModel;
@@ -177,32 +171,32 @@ macro_rules! openai_compatible_provider {
         use $crate::providers::openai_chat_completions::OpenAIChatCompletions;
         use settings::$settings_struct;
 
-        #[doc = concat!("The ", $provider_display_name, " provider, wrapping OpenAI Chat Completions API.")]
+        #[doc = concat!("The ", stringify!($provider_struct), " provider, wrapping OpenAI Chat Completions API.")]
         #[derive(Debug, Clone)]
         pub struct $provider_struct<M: ModelName> {
-            #[doc = concat!("Configuration settings for the ", $provider_display_name, " provider.")]
+            #[doc = concat!("Configuration settings for the ", stringify!($provider_struct), " provider.")]
             pub settings: $settings_struct,
             pub(crate) inner: OpenAIChatCompletions<M>,
         }
 
         impl<M: ModelName> $provider_struct<M> {
-            #[doc = concat!($provider_display_name, " provider setting builder.")]
+            #[doc = concat!(stringify!($provider_struct), " provider setting builder.")]
             pub fn builder() -> $builder_struct<M> {
                 $builder_struct::default()
             }
         }
 
         impl $provider_struct<DynamicModel> {
             #[doc = concat!(
-                "Creates a ", $provider_display_name, " provider with a dynamic model name using default settings.\n\n",
+                "Creates a ", stringify!($provider_struct), " provider with a dynamic model name using default settings.\n\n",
                 "This allows you to specify the model name as a string rather than\n",
-                "using methods like `", stringify!($provider_struct), "::", $example_method, "`, etc.\n\n",
+                "using typed constructor methods.\n\n",
                 "**WARNING**: when using `DynamicModel`, model capabilities are not validated.\n",
                 "This means there is no compile-time guarantee that the model supports requested features.\n\n",
                 "For custom configuration (API key, base URL, etc.), use the builder pattern:\n",
                 "`", stringify!($provider_struct), "::<DynamicModel>::builder().model_name(...).api_key(...).build()`\n\n",
                 "# Parameters\n\n",
-                "* `model_name` - The ", $provider_display_name, " model identifier (e.g., \"", $example_model, "\")\n\n",
+                "* `model_name` - The model identifier (e.g., \"", $example_model, "\")\n\n",
                 "# Returns\n\n",
                 "A configured `", stringify!($provider_struct), "<DynamicModel>` provider instance with default settings."
             )]
@@ -215,20 +209,20 @@ macro_rules! openai_compatible_provider {
         }
 
         impl<M: ModelName> Default for $provider_struct<M> {
-            #[doc = concat!("Creates a new ", $provider_display_name, " provider with default settings.")]
+            #[doc = concat!("Creates a new ", stringify!($provider_struct), " provider with default settings.")]
             fn default() -> $provider_struct<M> {
                 $builder_struct::default().build().unwrap()
             }
         }
 
-        #[doc = concat!($provider_display_name, " provider builder")]
+        #[doc = concat!(stringify!($provider_struct), " provider builder")]
         pub struct $builder_struct<M: ModelName> {
             settings: $settings_struct,
             inner: OpenAIChatCompletions<M>,
         }
 
         impl<M: ModelName> Default for $builder_struct<M> {
-            #[doc = concat!("Creates a new ", $provider_display_name, " provider builder with default settings.")]
+            #[doc = concat!("Creates a new ", stringify!($provider_struct), " provider builder with default settings.")]
             fn default() -> Self {
                 let settings = $settings_struct::default();
                 let mut inner = OpenAIChatCompletions::default();
@@ -242,7 +236,7 @@ macro_rules! openai_compatible_provider {
 
         impl<M: ModelName> $builder_struct<M> {
             #[doc = concat!(
-                "Sets the provider name for the ", $provider_display_name, " provider.\n\n",
+                "Sets the provider name for the ", stringify!($provider_struct), " provider.\n\n",
                 "# Parameters\n\n",
                 "* `provider_name` - The provider name string.\n\n",
                 "# Returns\n\n",
@@ -256,7 +250,7 @@ macro_rules! openai_compatible_provider {
             }
 
             #[doc = concat!(
-                "Sets the base URL for the ", $provider_display_name, " provider.\n\n",
+                "Sets the base URL for the ", stringify!($provider_struct), " provider.\n\n",
                 "# Parameters\n\n",
                 "* `base_url` - The base URL string for API requests.\n\n",
                 "# Returns\n\n",
@@ -270,7 +264,7 @@ macro_rules! openai_compatible_provider {
             }
 
             #[doc = concat!(
-                "Sets the API key for the ", $provider_display_name, " provider.\n\n",
+                "Sets the API key for the ", stringify!($provider_struct), " provider.\n\n",
                 "# Parameters\n\n",
                 "* `api_key` - The API key string for authentication.\n\n",
                 "# Returns\n\n",
@@ -284,7 +278,7 @@ macro_rules! openai_compatible_provider {
             }
 
             #[doc = concat!(
-                "Builds the ", $provider_display_name, " provider.\n\n",
+                "Builds the ", stringify!($provider_struct), " provider.\n\n",
                 "Validates the configuration and creates the provider instance.\n\n",
                 "# Returns\n\n",
                 "A `Result` containing the configured `", stringify!($provider_struct), "<M>` or an `Error`."
@@ -314,10 +308,9 @@ macro_rules! openai_compatible_provider {
                 "Sets the model name from a string. e.g., \"", $example_model, "\"\n\n",
                 "**WARNING**: when using `DynamicModel`, model capabilities are not validated.\n",
                 "This means there is no compile-time guarantee that the model supports requested features.\n\n",
-                "For compile-time model validation, use the constructor methods like `",
-                stringify!($provider_struct), "::", $example_method, "`.\n\n",
+                "For compile-time model validation, use typed constructor methods.\n\n",
                 "# Parameters\n\n",
-                "* `model_name` - The ", $provider_display_name, " model identifier (e.g., \"", $example_model, "\")\n\n",
+                "* `model_name` - The model identifier (e.g., \"", $example_model, "\")\n\n",
                 "# Returns\n\n",
                 "The builder with the model name set."
             )]

src/providers/openai_chat_completions/macros.rs

@@ -16,13 +16,11 @@ crate::openai_compatible_provider!(
     OpenRouter,
     OpenRouterBuilder,
     OpenRouterProviderSettings,
-    "OpenRouter",
-    "anthropic/claude-3.5-sonnet",
-    "anthropic_claude_3_5_sonnet()"
+    "anthropic/claude-3.5-sonnet"
 );
 
 // Generate the language model implementation
-crate::openai_compatible_language_model!(OpenRouter, "OpenRouter");
+crate::openai_compatible_language_model!(OpenRouter);
 
 // Generate the embedding model implementation
-crate::openai_compatible_embedding_model!(OpenRouter, "OpenRouter");
+crate::openai_compatible_embedding_model!(OpenRouter);

src/providers/openrouter/mod.rs

@@ -16,13 +16,11 @@ crate::openai_compatible_provider!(
     TogetherAI,
     TogetherAIBuilder,
     TogetherAIProviderSettings,
-    "Together AI",
-    "Llama-3.3-70B-Instruct-Turbo",
-    "llama_3_3_70b_spec_dec()"
+    "Llama-3.3-70B-Instruct-Turbo"
 );
 
 // Generate the language model implementation
-crate::openai_compatible_language_model!(TogetherAI, "Together AI");
+crate::openai_compatible_language_model!(TogetherAI);
 
 // Generate the embedding model implementation
-crate::openai_compatible_embedding_model!(TogetherAI, "Together AI");
+crate::openai_compatible_embedding_model!(TogetherAI);

src/providers/togetherai/mod.rs

@@ -16,13 +16,11 @@ crate::openai_compatible_provider!(
     Vercel,
     VercelBuilder,
     VercelProviderSettings,
-    "Vercel",
-    "claude-3-5-haiku-2024-10-22",
-    "claude_3_5_haiku()"
+    "claude-3-5-haiku-2024-10-22"
 );
 
 // Generate the language model implementation
-crate::openai_compatible_language_model!(Vercel, "Vercel");
+crate::openai_compatible_language_model!(Vercel);
 
 // Generate the embedding model implementation
-crate::openai_compatible_embedding_model!(Vercel, "Vercel");
+crate::openai_compatible_embedding_model!(Vercel);

src/providers/vercel/mod.rs

@@ -12,14 +12,7 @@ crate::openai_compatible_settings!(
 );
 
 // Generate the provider struct and builder
-crate::openai_compatible_provider!(
-    XAI,
-    XAIBuilder,
-    XAISettings,
-    "xAI",
-    "grok-2-latest",
-    "grok_2()"
-);
+crate::openai_compatible_provider!(XAI, XAIBuilder, XAISettings, "grok-2-latest");
 
 // Generate the language model implementation
-crate::openai_compatible_language_model!(XAI, "xAI");
+crate::openai_compatible_language_model!(XAI);