Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cactus/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import openai
import tiktoken

from constants import CLASSIFICATOR_SCHEMA_GEMINI, CLASSIFICATOR_SCHEMA_OPENAI, MODEL_TOKEN_LIMITS, PROMPT_CLASSIFICATOR_SYSTEM
from .constants import CLASSIFICATOR_SCHEMA_GEMINI, CLASSIFICATOR_SCHEMA_OPENAI, MODEL_TOKEN_LIMITS, PROMPT_CLASSIFICATOR_SYSTEM

import google.generativeai as genai
from google.generativeai import protos
Expand Down
13 changes: 6 additions & 7 deletions cactus/cactus.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,19 @@

sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))) # Add

from api import get_clusters_from_gemini, get_clusters_from_openai, load_api_key, setup_api_key
from changelog import generate_changelog
from utils import setup_logging
from git_utils import run, get_git_diff, restore_changes, parse_diff, stage_changes
from grouper import parse_diff, stage_changes
from .api import get_clusters_from_gemini, get_clusters_from_openai, load_api_key, setup_api_key
from .changelog import generate_changelog
from .utils import setup_logging
from .git_utils import run, get_git_diff, restore_changes, parse_diff, stage_changes
from .grouper import parse_diff, stage_changes

from unidiff import PatchSet
from loguru import logger

from prompt_toolkit.shortcuts import print_formatted_text
from prompt_toolkit.formatted_text import FormattedText
from prompt_toolkit.styles import Style
from prompt import display_clusters, handle_user_input

from .prompt import display_clusters, handle_user_input

def extract_patches(diff_data):
"""
Expand Down
6 changes: 3 additions & 3 deletions cactus/changelog.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import sys
from loguru import logger

from constants import MODEL_TOKEN_LIMITS, PROMPT_CHANGELOG_GENERATOR, PROMPT_CHANGELOG_SYSTEM
from api import num_tokens_from_string, split_into_chunks
from utils import run
from .constants import MODEL_TOKEN_LIMITS, PROMPT_CHANGELOG_GENERATOR, PROMPT_CHANGELOG_SYSTEM
from .api import num_tokens_from_string, split_into_chunks
from .utils import run
import google.generativeai as genai
import openai

Expand Down
2 changes: 1 addition & 1 deletion cactus/git_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import tempfile
from loguru import logger
from unidiff import PatchSet, UnidiffParseError
from utils import run
from .utils import run


def get_git_diff(context_size):
Expand Down
2 changes: 1 addition & 1 deletion cactus/grouper.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import re
import numpy as np
from collections import Counter
from git_utils import parse_diff, stage_changes
from .git_utils import parse_diff, stage_changes
from sklearn.cluster import AgglomerativeClustering
from sklearn.feature_extraction.text import CountVectorizer, TfidfVectorizer
from sklearn.metrics.pairwise import cosine_similarity
Expand Down