Skip to content
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.

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

chore: improve gemini models #11745

Merged
merged 1 commit into from
Dec 17, 2024
Merged

chore: improve gemini models #11745

merged 1 commit into from
Dec 17, 2024

Conversation

hjlarry
Copy link
Contributor

@hjlarry hjlarry commented Dec 17, 2024

Summary

Tip

Close issue syntax: Fixes #<issue number> or Resolves #<issue number>, see documentation for more details.

1. add some missing features of some models

2. use the property of MultiModelPromptMessageContent

3. fix may raise error on windows platform

2024-12-16 23:14:12,294.294 ERROR [Thread-11 (_generate_worker)] [app_generator.py:239] - Error when generating
Traceback (most recent call last):
  File "C:\Users\hejl\PycharmProjects\dify\api\core\model_runtime\model_providers\__base\large_language_model.py", line 110, in invoke
    result = self._invoke(
             ^^^^^^^^^^^^^
  File "C:\Users\hejl\PycharmProjects\dify\api\core\model_runtime\model_providers\google\llm\llm.py", line 66, in _invoke
    return self._generate(model, credentials, prompt_messages, model_parameters, tools, stop, stream, user)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "C:\Users\hejl\PycharmProjects\dify\api\core\model_runtime\model_providers\google\llm\llm.py", line 195, in _generate
    content = self._format_message_to_glm_content(msg)
              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "C:\Users\hejl\PycharmProjects\dify\api\core\model_runtime\model_providers\google\llm\llm.py", line 383, in _format_message_to_glm_content
    glm_content["parts"].append(self._upload_file_content_to_google(c))
                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "C:\Users\hejl\PycharmProjects\dify\api\core\model_runtime\model_providers\google\llm\llm.py", line 365, in _upload_file_content_to_google
    os.unlink(temp_file.name)
PermissionError: [WinError 32] 另一个程序正在使用此文件,进程无法访问。: 'C:\\Users\\hejl\\AppData\\Local\\Temp\\tmpear9twnj'

Screenshots

Before After
... ...

Checklist

Important

Please review the checklist below before submitting your pull request.

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. ⚙️ feat:model-runtime 💪 enhancement New feature or request labels Dec 17, 2024
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Dec 17, 2024
@crazywoola crazywoola merged commit 9048832 into langgenius:main Dec 17, 2024
5 checks passed
tastelikefeet added a commit to tastelikefeet/dify that referenced this pull request Dec 19, 2024
…elscope

* commit '2624a6dcd0b89dd7c1aac2d7bfe7f769e9e3c992': (630 commits)
  Fix explore app icon (langgenius#11808)
  ci: fix config ci and it works (langgenius#11807)
  ci: add config ci more disscuss check langgenius#11706 (langgenius#11752)
  chore: bump version to 0.14.1 (langgenius#11784)
  feat:add hunyuan model(hunyuan-role, hunyuan-large, hunyuan-large-rol… (langgenius#11766)
  chore(opendal_storage): remove unused comment (langgenius#11783)
  feat: Disable the "Forgot your password?" button when the mail server setup is incomplete (langgenius#11653)
  chore(.env.example): add comments for opendal (langgenius#11778)
  Lindorm vdb bug-fix (langgenius#11790)
  fix: imperfect service-api introduction text (langgenius#11782)
  feat: add openai o1 & update pricing and max_token of other models (langgenius#11780)
  fix: file upload auth (langgenius#11774)
  feat: add parameters for JinaReaderTool (langgenius#11613)
  feat: full support for opendal and sync configurations between .env and docker-compose (langgenius#11754)
  feat(app_factory): speed up api startup (langgenius#11762)
  fix: Prevent redirection to /overview when accessing /workflow. (langgenius#11733)
  (doc) fix: update cURL examples to include Authorization header (langgenius#11750)
  Fix explore app icon (langgenius#11742)
  chore: improve gemini models (langgenius#11745)
  feat: use Gemini response metadata for token counting (langgenius#11743)
  ...
Scorpion1221 added a commit to yybht155/dify that referenced this pull request Dec 19, 2024
* commit '926546b153a701dfbfc71eb8157f9a41320444f8': (486 commits)
  chore: bump version to 0.14.1 (langgenius#11784)
  feat:add hunyuan model(hunyuan-role, hunyuan-large, hunyuan-large-rol… (langgenius#11766)
  chore(opendal_storage): remove unused comment (langgenius#11783)
  feat: Disable the "Forgot your password?" button when the mail server setup is incomplete (langgenius#11653)
  chore(.env.example): add comments for opendal (langgenius#11778)
  Lindorm vdb bug-fix (langgenius#11790)
  fix: imperfect service-api introduction text (langgenius#11782)
  feat: add openai o1 & update pricing and max_token of other models (langgenius#11780)
  fix: file upload auth (langgenius#11774)
  feat: add parameters for JinaReaderTool (langgenius#11613)
  feat: full support for opendal and sync configurations between .env and docker-compose (langgenius#11754)
  feat(app_factory): speed up api startup (langgenius#11762)
  fix: Prevent redirection to /overview when accessing /workflow. (langgenius#11733)
  (doc) fix: update cURL examples to include Authorization header (langgenius#11750)
  Fix explore app icon (langgenius#11742)
  chore: improve gemini models (langgenius#11745)
  feat: use Gemini response metadata for token counting (langgenius#11743)
  chore: update comments in docker env file (langgenius#11705)
  feat(ark): support doubao vision series models (langgenius#11740)
  chore: the consistency of MultiModalPromptMessageContent (langgenius#11721)
  ...

# Conflicts:
#	api/configs/app_config.py
#	api/core/helper/code_executor/code_executor.py
#	web/yarn.lock
jiangbo721 pushed a commit to jiangbo721/dify that referenced this pull request Dec 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💪 enhancement New feature or request ⚙️ feat:model-runtime lgtm This PR has been approved by a maintainer size:M This PR changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants