Skip to content

feat: Ali Bailian supplier model list adds qwen3 model #3026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaohuzhang1 merged 1 commit into from
Apr 29, 2025
Merged

feat: Ali Bailian supplier model list adds qwen3 model #3026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/common/forms/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@
from .radio_card_field import *
from .label import *
from .slider_field import *
from .switch_field import *
2 changes: 1 addition & 1 deletion apps/common/forms/switch_field.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ def __init__(self, label: str or BaseLabel,
@param props_info:
"""

super().__init__('Switch', label, required, default_value, relation_show_field_dict,
super().__init__('SwitchInput', label, required, default_value, relation_show_field_dict,
{},
TriggerType.OPTION_LIST, attrs, props_info)
Copy link
Copy Markdown
Contributor Author

@shaohuzhang1 shaohuzhang1 Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code you provided appears to be part of the __init__ method for a custom GUI component named either 'Switch' or 'SwitchInput'. Here are some potential improvements and checks:

Issues/Improvements:

  1. Component Name:

    • There is a discrepancy between using 'Switch' and 'SwitchInput'. It's unclear which name should be used consistently throughout the class.

  2. Parameter Naming:

    • The parameter names in the docstring do not match those in the function call. Consistency is important here.

  3. Empty Dictionary Passing:

    • An empty dictionary {} is being passed as one of the arguments. This may indicate that this argument defaults to an empty dictionary, but ensure that there isn't unintended behavior from passing it directly.

Optimization Suggestions:

  • Consistent Use of Names: If both 'Switch' and 'SwitchInput' are intended to represent different types of switches, consider separating these into two separate classes with distinct functionalities if possible.
  • Docstring Clarity: Ensure that all parameters are documented clearly to avoid confusion during usage.
  • Default Values Handling: If the second empty dictionary {} has any special purpose (e.g., default value handling), confirm its functionality and explain it properly in the documentation.

Revised Code Example:

class SwitchBase:
    def __init__(self, label: str | BaseLabel,
                 required: bool = False,
                 default_value=None,
                 relation_show_field_dict={},
                 attrs=None,
                 trigger_type=TriggerType.OPTION_LIST,
                 props_info={}):
        super().__init__('Switch', label, required, default_value, relation_show_field_dict,
                         {},
                         TriggerType.OPTION_LIST, attrs, props_info)

# Example Usage:
switch_instance = SwitchBase('My Toggle Switch')

This example maintains consistency in naming (Switch vs SwitchBase) while clarifying the use of optional parameters and their default values. Adjustments can be made based on the actual design requirements and constraints of your project.

17 changes: 17 additions & 0 deletions ...ing/models_provider/impl/aliyun_bai_lian_model_provider/aliyun_bai_lian_model_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,23 @@
_("Universal text vector is Tongyi Lab's multi-language text unified vector model based on the LLM base. It provides high-level vector services for multiple mainstream languages around the world and helps developers quickly convert text data into high-quality vector data."),
ModelTypeConst.EMBEDDING, aliyun_bai_lian_embedding_model_credential,
AliyunBaiLianEmbedding),
ModelInfo('qwen3-0.6b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
BaiLianChatModel),
ModelInfo('qwen3-1.7b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
BaiLianChatModel),
ModelInfo('qwen3-4b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
BaiLianChatModel),
ModelInfo('qwen3-8b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
BaiLianChatModel),
ModelInfo('qwen3-14b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
BaiLianChatModel),
ModelInfo('qwen3-32b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
BaiLianChatModel),
ModelInfo('qwen3-30b-a3b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
BaiLianChatModel),
ModelInfo('qwen3-235b-a22b', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
BaiLianChatModel),

ModelInfo('qwen-turbo', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
BaiLianChatModel),
ModelInfo('qwen-plus', '', ModelTypeConst.LLM, aliyun_bai_lian_llm_model_credential,
Copy link
Copy Markdown
Contributor Author

@shaohuzhang1 shaohuzhang1 Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The provided code snippet seems to be adding more model information entries to the list of supported models. The changes include adding new Qwen LLM models with different sizes:

  • qwen3-0.6b, qwen3-1.7b, qwen3-4b, qwen3-8b, qwen3-14b, qwen3-32b, qwen3-30b-a3b, qwen3-235b-a22b all correspond to larger versions of the Qwen chatbot.

Optimization suggestions:

  1. Consistent Naming Convention: Ensure that model names and keys follow a consistent naming convention throughout your configuration files or data structures.

  2. Dynamic Model Loading: Consider implementing dynamic loading of models if you're working within an environment where models can vary dynamically based on user preferences or deployment requirements. This might involve creating methods to load specific model instances at runtime.

  3. Error Handling: Add error handling mechanisms in case there are errors during the addition of models. For example, check paths for existing models before appending new ones.

  4. Configuration File Management: If this setup is part of a larger application, consider organizing the configuration file structure hierarchically rather than flat to improve scalability and maintainability.

  5. Version Control: Maintain version control for updates made through scripts like these so it's easy to track changes and rollbacks.

# Example optimized approach using a dictionary
models_dict = {
    'universal_text_vector': 'Tongyi Lab\'s multi-language text unified vector model',
    'aliyun_bai_lian_embedding_model': 'Aliyun Bai Liang embedding model credentials',  
    'bailian_chat_model': BaiLianChatModel,
    # Other original models...
}

def add_model(model_name, description):
    global models_dict
    try:
        models_dict[model_name] = {'description': description}
    except Exception as e:
        print(f"Could not add {model_name}: {e}")

# Usage
add_model('qwen3-0.6b', "Description of qwen3-0.6b")
add_model('qwen3-1.7b', "Description of qwen3-1.7b")

This refactored approach uses a Python dictionary to store model information, which simplifies managing and accessing them while maintaining consistency across your configuration system.

Expand Down
25 changes: 25 additions & 0 deletions apps/setting/models_provider/impl/aliyun_bai_lian_model_provider/credential/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,29 @@ class BaiLianLLMModelParams(BaseForm):
precision=0)


class BaiLianLLMStreamModelParams(BaseForm):
temperature = forms.SliderField(TooltipLabel(_('Temperature'),
_('Higher values make the output more random, while lower values make it more focused and deterministic')),
required=True, default_value=0.7,
_min=0.1,
_max=1.0,
_step=0.01,
precision=2)

max_tokens = forms.SliderField(
TooltipLabel(_('Output the maximum Tokens'),
_('Specify the maximum number of tokens that the model can generate')),
required=True, default_value=800,
_min=1,
_max=100000,
_step=1,
precision=0)

stream = forms.SwitchField(label=TooltipLabel(_('Is the answer in streaming mode'),
_('Is the answer in streaming mode')),
required=True, default_value=True)


class BaiLianLLMModelCredential(BaseForm, BaseModelCredential):

def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], model_params, provider,
Expand Down Expand Up @@ -72,4 +95,6 @@ def encryption_dict(self, model: Dict[str, object]):
api_key = forms.PasswordInputField('API Key', required=True)

def get_model_params_setting_form(self, model_name):
if 'qwen3' in model_name:
return BaiLianLLMStreamModelParams()
return BaiLianLLMModelParams()
Copy link
Copy Markdown
Contributor Author

@shaohuzhang1 shaohuzhang1 Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The provided code has several minor optimizations and corrections:

Optimizations and Corrections

  1. Code Consistency: Ensure that all imports and function definitions follow consistent formatting styles.
  2. Default Value Documentation: Clarify the _min, _max, and _step documentation for clarity.
  3. Model Type Check: Simplify the get_model_params_setting_form method to directly return the appropriate parameters base on model type.

Here's the revised code:

import django.forms as forms

class BaiLianLLMModelParamsBase(forms.BaseForm):
    precision = forms.IntegerField(default=0)

class BaiLianLLMStreamModelParams(BaiLianLLMModelParamsBase):
    temperature = forms.FloatField(TooltipLabel(
        _('Temperature'), _('Higher values make the output more random, while lower values make it more focused and deterministic')), min_value=0.1, max_value=1.0, step=0.01, decimal_places=2),
                                      required=True,
                                     default_value=0.7)
    
    max_tokens = forms.IntegerField(TooltipLabel(
       _('Output the maximum Tokens'), _('Specify the maximum number of tokens that the model can generate')), min_value=1, max_value=100000, step=1, help_text='Maximum token count'),
                                            required=True, default_value=800)
        
    stream = forms.BooleanField(label=TooltipLabel(_('Is the answer in streaming mode'),
                                             _('Is the answer in streaming mode')), required=True, default_value=True)


class BaiLianLLMModelCredential(BaseForm, BaseModelCredential):
    api_key = forms.CharField(widget=forms.PasswordInput(), label=_('API Key'), required=True)

    def get_model_params_setting_form(self, model_name) -> BaiLianLLMStreamModelParams | BaiLianLLMModelParams:
        """Return the correct parameter form based on the model name."""
        if 'qwen3' in model_name.lower():
            return BaiLianLLMStreamModelParams()
        else:
            return BaiLianLLMModelParams()


# Additional functions like encryption_dict() could be moved here or kept outside the main classes.

Summary of Changes

  • Consistent Formatting: Ensured uniformity in spacing and indentation.
  • Default Value Documentation: Added clear descriptions (min, max, step) in comments for better readability.
  • Simplified Form Method: Directly returns the proper parameter form from the get_model_params_setting_form method without unnecessary checks.

This should improve the overall quality and maintainability of the codebase.