Skip to content

Feat/new branch management#267

Merged
kevinaimonster merged 4 commits intomasterfrom
feat/NewBranchManagement
Apr 23, 2025
Merged

Feat/new branch management#267
kevinaimonster merged 4 commits intomasterfrom
feat/NewBranchManagement

Conversation

@kevin-mindverse
Copy link
Contributor

@kevin-mindverse kevin-mindverse commented Apr 23, 2025

PR Description: Optimize CONTRIBUTING.md with Unified Branch Management Strategy

Changes Overview

This PR updates the CONTRIBUTING.md file, transitioning the project from a single master branch model to a structured release branch development model, while unifying workflows for both internal and external contributors. Key updates include:

  1. Implemented unified branch strategy

    • master: Stable version branch
    • develop: Development integration branch
    • release/vX.Y.Z: Release preparation branches
    • feature/*: Feature development branches
    • hotfix/*: Hotfix branches
  2. Simplified and unified contribution process

    • Internal and external contributors follow the same workflow
    • All feature branches are created from master
    • All PRs are merged to the develop branch
    • Step-by-step instructions for the complete development process
  3. Optimized release management

    • Clear process for release branch creation and management
    • Transparent PR merge strategy
    • Standardized hotfix handling procedures
  4. Streamlined document structure

    • Step-based guidance instead of role-separated instructions
    • Integrated maintainer responsibilities into release management
    • Provided clearer workflow diagrams

Purpose

This update aims to:

  • Simplify the project contribution process, lowering the barrier for new contributors
  • Unify internal and external development workflows, reducing maintenance costs
  • Establish stricter version control to ensure stable releases
  • Create a clear release path for better project planning

Key Improvements

  • All developers (internal or external) create feature branches from the master branch
  • All feature development is integrated and reviewed through the develop branch
  • Release preparation is done through release branches, ultimately merging to master
  • Documentation uses a step-based format for better clarity and understanding

Please review this PR to ensure the updated contribution guidelines are clear and effectively guide all contributors in project development.

Copy link
Contributor

@Llux-C Llux-C left a comment

Choose a reason for hiding this comment

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

👍

@kevinaimonster kevinaimonster self-requested a review April 23, 2025 08:19
Copy link
Contributor

@kevinaimonster kevinaimonster left a comment

Choose a reason for hiding this comment

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

Good Job!

@kevinaimonster kevinaimonster merged commit 8ace28a into master Apr 23, 2025
1 check passed
yexiangle pushed a commit that referenced this pull request Apr 24, 2025
* feat: new branch management

* feat: fix multi-upload

* optimize contribute management
kevin-mindverse added a commit that referenced this pull request Apr 24, 2025
* fix: modify thinking_model loading configuration

* feat: realize thinkModel ui

* feat:store

* feat: add combined_llm_config_dto

* add thinking_model_config & database migration

* directly add thinking model to user_llm_config

* delete thinking model repo dto service

* delete thinkingmodel table migration

* add is_cot config

* feat: allow define  is_cot

* feat: simplify logs info

* feat: add training model

* feat: fix is_cot problem

* fix: fix chat message

* fix: fix progress error

* fix: disable no settings thinking

* feat: add thinking warning

* fix: fix start service error

* feat:fix init trainparams problem

* feat: change playGround prompt

* feat: Add Dimension Mismatch Handling for ChromaDB (#157) (#207)

* Fix Issue #157

Add chroma_utils.py to manage chromaDB and added docs for explanation

* Add logging and debugging process

- Enhanced the`reinitialize_chroma_collections` function in`chroma_utils.py` to properly check if collections exist before attempting to delete them, preventing potential errors when collections don't exist.
- Improved error handling in the`_handle_dimension_mismatch` method in`embedding_service.py` by adding more robust exception handling and verification steps after reinitialization.
- Enhanced the collection initialization process in`embedding_service.py` to provide more detailed error messages and better handle cases where collections still have incorrect dimensions after reinitialization.
- Added additional verification steps to ensure that collection dimensions match the expected dimension after creation or retrieval.
- Improved logging throughout the code to provide more context in error messages, making debugging easier.

* Change topics_generator timeout to 30 (#263)

* quick fix

* fix: shade -> shade_merge_info (#265)

* fix: shade -> shade_merge_info

* add convert array

* quick fix import error

* add log

* add heartbeat

* new strategy

* sse version

* add heartbeat

* zh to en

* optimize code

* quick fix convert function

* Feat/new branch management (#267)

* feat: new branch management

* feat: fix multi-upload

* optimize contribute management

---------

Co-authored-by: Crabboss Mr <1123357821@qq.com>
Co-authored-by: Ye Xiangle <yexiangle@mail.mindverse.ai>
Co-authored-by: Xinghan Pan <sampan090611@gmail.com>
Co-authored-by: doubleBlack2 <108928143+doubleBlack2@users.noreply.github.com>
Co-authored-by: kevin-mindverse <kevin@mindverse.ai>
Co-authored-by: KKKKKKKevin <115385420+kevin-mindverse@users.noreply.github.com>
Heterohabilis pushed a commit to Heterohabilis/Second-Me that referenced this pull request May 29, 2025
* feat: new branch management

* feat: fix multi-upload

* optimize contribute management
Heterohabilis pushed a commit to Heterohabilis/Second-Me that referenced this pull request May 29, 2025
* fix: modify thinking_model loading configuration

* feat: realize thinkModel ui

* feat:store

* feat: add combined_llm_config_dto

* add thinking_model_config & database migration

* directly add thinking model to user_llm_config

* delete thinking model repo dto service

* delete thinkingmodel table migration

* add is_cot config

* feat: allow define  is_cot

* feat: simplify logs info

* feat: add training model

* feat: fix is_cot problem

* fix: fix chat message

* fix: fix progress error

* fix: disable no settings thinking

* feat: add thinking warning

* fix: fix start service error

* feat:fix init trainparams problem

* feat: change playGround prompt

* feat: Add Dimension Mismatch Handling for ChromaDB (mindverse#157) (mindverse#207)

* Fix Issue mindverse#157

Add chroma_utils.py to manage chromaDB and added docs for explanation

* Add logging and debugging process

- Enhanced the`reinitialize_chroma_collections` function in`chroma_utils.py` to properly check if collections exist before attempting to delete them, preventing potential errors when collections don't exist.
- Improved error handling in the`_handle_dimension_mismatch` method in`embedding_service.py` by adding more robust exception handling and verification steps after reinitialization.
- Enhanced the collection initialization process in`embedding_service.py` to provide more detailed error messages and better handle cases where collections still have incorrect dimensions after reinitialization.
- Added additional verification steps to ensure that collection dimensions match the expected dimension after creation or retrieval.
- Improved logging throughout the code to provide more context in error messages, making debugging easier.

* Change topics_generator timeout to 30 (mindverse#263)

* quick fix

* fix: shade -> shade_merge_info (mindverse#265)

* fix: shade -> shade_merge_info

* add convert array

* quick fix import error

* add log

* add heartbeat

* new strategy

* sse version

* add heartbeat

* zh to en

* optimize code

* quick fix convert function

* Feat/new branch management (mindverse#267)

* feat: new branch management

* feat: fix multi-upload

* optimize contribute management

---------

Co-authored-by: Crabboss Mr <1123357821@qq.com>
Co-authored-by: Ye Xiangle <yexiangle@mail.mindverse.ai>
Co-authored-by: Xinghan Pan <sampan090611@gmail.com>
Co-authored-by: doubleBlack2 <108928143+doubleBlack2@users.noreply.github.com>
Co-authored-by: kevin-mindverse <kevin@mindverse.ai>
Co-authored-by: KKKKKKKevin <115385420+kevin-mindverse@users.noreply.github.com>
EOMZON pushed a commit to EOMZON/Second-Me that referenced this pull request Feb 1, 2026
* feat: new branch management

* feat: fix multi-upload

* optimize contribute management
EOMZON pushed a commit to EOMZON/Second-Me that referenced this pull request Feb 1, 2026
* fix: modify thinking_model loading configuration

* feat: realize thinkModel ui

* feat:store

* feat: add combined_llm_config_dto

* add thinking_model_config & database migration

* directly add thinking model to user_llm_config

* delete thinking model repo dto service

* delete thinkingmodel table migration

* add is_cot config

* feat: allow define  is_cot

* feat: simplify logs info

* feat: add training model

* feat: fix is_cot problem

* fix: fix chat message

* fix: fix progress error

* fix: disable no settings thinking

* feat: add thinking warning

* fix: fix start service error

* feat:fix init trainparams problem

* feat: change playGround prompt

* feat: Add Dimension Mismatch Handling for ChromaDB (mindverse#157) (mindverse#207)

* Fix Issue mindverse#157

Add chroma_utils.py to manage chromaDB and added docs for explanation

* Add logging and debugging process

- Enhanced the`reinitialize_chroma_collections` function in`chroma_utils.py` to properly check if collections exist before attempting to delete them, preventing potential errors when collections don't exist.
- Improved error handling in the`_handle_dimension_mismatch` method in`embedding_service.py` by adding more robust exception handling and verification steps after reinitialization.
- Enhanced the collection initialization process in`embedding_service.py` to provide more detailed error messages and better handle cases where collections still have incorrect dimensions after reinitialization.
- Added additional verification steps to ensure that collection dimensions match the expected dimension after creation or retrieval.
- Improved logging throughout the code to provide more context in error messages, making debugging easier.

* Change topics_generator timeout to 30 (mindverse#263)

* quick fix

* fix: shade -> shade_merge_info (mindverse#265)

* fix: shade -> shade_merge_info

* add convert array

* quick fix import error

* add log

* add heartbeat

* new strategy

* sse version

* add heartbeat

* zh to en

* optimize code

* quick fix convert function

* Feat/new branch management (mindverse#267)

* feat: new branch management

* feat: fix multi-upload

* optimize contribute management

---------

Co-authored-by: Crabboss Mr <1123357821@qq.com>
Co-authored-by: Ye Xiangle <yexiangle@mail.mindverse.ai>
Co-authored-by: Xinghan Pan <sampan090611@gmail.com>
Co-authored-by: doubleBlack2 <108928143+doubleBlack2@users.noreply.github.com>
Co-authored-by: kevin-mindverse <kevin@mindverse.ai>
Co-authored-by: KKKKKKKevin <115385420+kevin-mindverse@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants