mirror of
https://github.com/wassname/Open-Assistant.git
synced 2026-06-27 16:10:30 +08:00
Merge branch 'main' of github.com:LAION-AI/Open-Assistant
This commit is contained in:
@@ -202,7 +202,7 @@ class TreeManager:
|
||||
lang = "en"
|
||||
logger.warning("Task availability request without lang tag received, assuming lang='en'.")
|
||||
|
||||
num_active_trees = self.query_num_active_trees(lang=lang)
|
||||
num_active_trees = self.query_num_active_trees(lang=lang, exclude_ranking=True)
|
||||
extendible_parents = self.query_extendible_parents(lang=lang)
|
||||
prompts_need_review = self.query_prompts_need_review(lang=lang)
|
||||
replies_need_review = self.query_replies_need_review(lang=lang)
|
||||
@@ -230,7 +230,7 @@ class TreeManager:
|
||||
lang = "en"
|
||||
logger.warning("Task request without lang tag received, assuming 'en'.")
|
||||
|
||||
num_active_trees = self.query_num_active_trees(lang=lang)
|
||||
num_active_trees = self.query_num_active_trees(lang=lang, exclude_ranking=True)
|
||||
prompts_need_review = self.query_prompts_need_review(lang=lang)
|
||||
replies_need_review = self.query_replies_need_review(lang=lang)
|
||||
extendible_parents = self.query_extendible_parents(lang=lang)
|
||||
@@ -995,12 +995,15 @@ INNER JOIN message_reaction mr ON mr.task_id = t.id AND mr.payload_type = 'Ranki
|
||||
for r in rankings:
|
||||
self.check_condition_for_scoring_state(r.message_tree_id)
|
||||
|
||||
def query_num_active_trees(self, lang: str) -> int:
|
||||
def query_num_active_trees(self, lang: str, exclude_ranking: bool = True) -> int:
|
||||
"""Count all active trees (optionally exclude those in ranking state)."""
|
||||
query = (
|
||||
self.db.query(func.count(MessageTreeState.message_tree_id))
|
||||
.join(Message, MessageTreeState.message_tree_id == Message.id)
|
||||
.filter(MessageTreeState.active, Message.lang == lang)
|
||||
)
|
||||
if exclude_ranking:
|
||||
query = query.filter(MessageTreeState.state != message_tree_state.State.RANKING)
|
||||
return query.scalar()
|
||||
|
||||
def query_reviews_for_message(self, message_id: UUID) -> list[TextLabels]:
|
||||
|
||||
Reference in New Issue
Block a user