Merge commit b34f8b5 from parent

Author: Zeeeepa

.github/actions/setup-environment/action.yml

@@ -9,7 +9,7 @@ runs:
   using: "composite"
   steps:
     - name: Install UV
-      uses: astral-sh/setup-uv@v5.3
+      uses: astral-sh/setup-uv@v5.4
       id: setup-uv
       with:
         enable-cache: true

.github/workflows/mypy.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/[email protected].1
+        uses: tj-actions/[email protected].3
 
       - name: Filter Python files
         id: filter-python

.github/workflows/release.yml

@@ -55,7 +55,7 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}
 
       - name: Install UV
-        uses: astral-sh/setup-uv@v5.3
+        uses: astral-sh/setup-uv@v5.4
         id: setup-uv
         with:
           enable-cache: false

codegen-examples/uv.lock

@@ -4,6 +4,31 @@ icon: "clock"
 iconType: "solid"
 ---
 
+<Update label="v0.52.19" description="March 21, 2025">
+### [Dependency update for OpenAI.](https://github.com/codegen-sh/codegen-sdk/releases/tag/v0.52.19)
+- Update OpenAI dependency to version 1.68.2
+</Update>
+
+<Update label="v0.52.18" description="March 21, 2025">
+### [Updates sentry-sdk dependency and changelog.](https://github.com/codegen-sh/codegen-sdk/releases/tag/v0.52.18)
+- Update sentry-sdk dependency to v2.24.0
+- Update changelog
+</Update>
+
+<Update label="v0.52.17" description="March 21, 2025">
+### [Reverts API change, fixes duplication, updates docs.](https://github.com/codegen-sh/codegen-sdk/releases/tag/v0.52.17)
+- Revert changes to API for removing unused symbols
+- Fix issue with duplicate additional tools
+- Update API reference documentation
+</Update>
+
+
+<Update label="v0.52.16" description="March 20, 2025">
+### [Updates OpenAI dependency and PR branch handling.](https://github.com/codegen-sh/codegen-sdk/releases/tag/v0.52.16)
+- Update dependency to OpenAI v1.68.0
+- Return branch name with PR changes
+</Update>
+
 <Update label="v0.52.15" description="March 20, 2025">
 ### [fixes token limit inversion bug.](https://github.com/codegen-sh/codegen-sdk/releases/tag/v0.52.15)
 - Fix token limit inversion bug

docs/changelog/changelog.mdx

@@ -6,7 +6,7 @@ readme = "README.md"
 # renovate: datasource=python-version depName=python
 requires-python = ">=3.12, <3.14"
 dependencies = [
-  "openai==1.68.0",
+  "openai==1.68.2",
   "tiktoken<1.0.0,>=0.5.1",
   "tabulate>=0.9.0,<1.0.0",
   "codeowners<1.0.0,>=0.6.0",
@@ -36,7 +36,7 @@ dependencies = [
   "rustworkx>=0.15.1",
   "typing-extensions>=4.12.2",
   "termcolor>=2.4.0",
-  "sentry-sdk==2.23.1",
+  "sentry-sdk==2.24.0",
   "click>=8.1.7",
   "requests>=2.32.3",
   "lazy-object-proxy>=0.0.0",

pyproject.toml

@@ -63,7 +63,7 @@ def create_codebase_agent(
     """
     llm = LLM(model_provider=model_provider, model_name=model_name, **kwargs)
 
-    # Get all codebase tools
+    # Initialize default tools
     tools = [
         ViewFileTool(codebase),
         ListDirectoryTool(codebase),
@@ -80,17 +80,13 @@ def create_codebase_agent(
         ReflectionTool(codebase),
         SearchFilesByNameTool(codebase),
         GlobalReplacementEditTool(codebase),
-        # SemanticSearchTool(codebase),
-        # =====[ Github Integration ]=====
-        # Enable Github integration
-        # GithubCreatePRTool(codebase),
-        # GithubViewPRTool(codebase),
-        # GithubCreatePRCommentTool(codebase),
-        # GithubCreatePRReviewCommentTool(codebase),
     ]
 
-    # Add additional tools if provided
     if additional_tools:
+        # Get names of additional tools
+        additional_names = {t.get_name() for t in additional_tools}
+        # Keep only tools that don't have matching names in additional_tools
+        tools = [t for t in tools if t.get_name() not in additional_names]
         tools.extend(additional_tools)
 
     memory = MemorySaver() if memory else None

src/codegen/extensions/langchain/agent.py

@@ -1,4 +1,3 @@
-import math
 import time
 from collections.abc import Callable
 from pathlib import Path
@@ -290,22 +289,6 @@ def get_transactions_at_range(self, file_path: Path, start_byte: int, end_byte:
 
         return matching_transactions
 
-    def get_transaction_containing_range(self, file_path: Path, start_byte: int, end_byte: int, transaction_order: TransactionPriority | None = None) -> Transaction | None:
-        """Returns the nearest transaction that includes the range specified given the filtering criteria."""
-        if file_path not in self.queued_transactions:
-            return None
-
-        smallest_difference = math.inf
-        best_fit_transaction = None
-        for t in self.queued_transactions[file_path]:
-            if t.start_byte <= start_byte and t.end_byte >= end_byte:
-                if transaction_order is None or t.transaction_order == transaction_order:
-                    smallest_difference = min(smallest_difference, abs(t.start_byte - start_byte) + abs(t.end_byte - end_byte))
-                    if smallest_difference == 0:
-                        return t
-                    best_fit_transaction = t
-        return best_fit_transaction
-
     def _get_conflicts(self, transaction: Transaction) -> list[Transaction]:
         """Returns all transactions that overlap with the given transaction"""
         overlapping_transactions = []

src/codegen/sdk/codebase/transaction_manager.py

@@ -943,13 +943,6 @@ def remove_unused_exports(self) -> None:
             None
         """
 
-    def remove_unused_imports(self) -> None:
-        # Process each import statement
-        for import_stmt in self.imports:
-            # Don't remove imports we can't be sure about
-            if import_stmt.usage_is_ascertainable():
-                import_stmt.remove_if_unused()
-
     ####################################################################################################################
     # MANIPULATIONS
     ####################################################################################################################

src/codegen/sdk/core/file.py

@@ -5,6 +5,7 @@
 from typing import TYPE_CHECKING, ClassVar, Generic, Literal, Self, TypeVar, override
 
 from codegen.sdk.codebase.resolution_stack import ResolutionStack
+from codegen.sdk.codebase.transactions import TransactionPriority
 from codegen.sdk.core.autocommit import commiter, reader, remover, writer
 from codegen.sdk.core.dataclasses.usage import UsageKind
 from codegen.sdk.core.expressions.name import Name
@@ -220,17 +221,6 @@ def is_symbol_import(self) -> bool:
         """
         return not self.is_module_import()
 
-    @reader
-    def usage_is_ascertainable(self) -> bool:
-        """Returns True if we can determine for sure whether the import is unused or not.
-
-        Returns:
-            bool: True if the usage can be ascertained for the import, False otherwise.
-        """
-        if self.is_wildcard_import() or self.is_sideffect_import():
-            return False
-        return True
-
     @reader
     def is_wildcard_import(self) -> bool:
         """Returns True if the import symbol is a wildcard import.
@@ -244,16 +234,6 @@ def is_wildcard_import(self) -> bool:
         """
         return self.import_type == ImportType.WILDCARD
 
-    @reader
-    def is_sideffect_import(self) -> bool:
-        # Maybe better name for this
-        """Determines if this is a sideffect.
-
-        Returns:
-            bool: True if this is a sideffect import, False otherwise
-        """
-        return self.import_type == ImportType.SIDE_EFFECT
-
     @property
     @abstractmethod
     def namespace(self) -> str | None:
@@ -681,21 +661,12 @@ def __eq__(self, other: object):
 
     @noapidoc
     @reader
-    def remove_if_unused(self, force: bool = False) -> bool:
-        """Removes import if it is not being used. Considers current transaction removals.
-
-        Args:
-            force (bool, optional): If true removes the import even if we cannot ascertain the usage for sure. Defaults to False.
-
-        Returns:
-            bool: True if removed, False if not
-        """
-        if all(usage.match.get_transaction_if_pending_removal() for usage in self.usages):
-            if not force and not self.usage_is_ascertainable():
-                return False
+    def remove_if_unused(self) -> None:
+        if all(
+            self.transaction_manager.get_transactions_at_range(self.filepath, start_byte=usage.match.start_byte, end_byte=usage.match.end_byte, transaction_order=TransactionPriority.Remove)
+            for usage in self.usages
+        ):
             self.remove()
-            return True
-        return False
 
     @noapidoc
     @reader

src/codegen/sdk/core/import_resolution.py

@@ -10,7 +10,7 @@
 from rich.pretty import Pretty
 
 from codegen.sdk.codebase.span import Span
-from codegen.sdk.codebase.transactions import EditTransaction, InsertTransaction, RemoveTransaction, Transaction, TransactionPriority
+from codegen.sdk.codebase.transactions import EditTransaction, InsertTransaction, RemoveTransaction, TransactionPriority
 from codegen.sdk.core.autocommit import commiter, reader, remover, repr_func, writer
 from codegen.sdk.core.placeholder.placeholder import Placeholder
 from codegen.sdk.extensions.utils import get_all_identifiers
@@ -1156,15 +1156,6 @@ def parent_class(self) -> Class | None:
 
         return self.parent_of_type(Class)
 
-    @noapidoc
-    def get_transaction_if_pending_removal(self) -> Transaction | None:
-        """Checks if this editable is being removed by some transaction and if so returns it.
-
-        Returns:
-            Transaction|None: The transaction removing the editable
-        """
-        return self.transaction_manager.get_transaction_containing_range(self.file.path, self.start_byte, self.end_byte, TransactionPriority.Remove)
-
     def _get_ast_children(self) -> list[tuple[str | None, AST]]:
         children = []
         names = {}

src/codegen/sdk/core/interfaces/editable.py

@@ -5,7 +5,6 @@
 
 from rich.markup import escape
 
-from codegen.sdk.codebase.transactions import TransactionPriority
 from codegen.sdk.core.autocommit import commiter, reader, writer
 from codegen.sdk.core.dataclasses.usage import UsageKind, UsageType
 from codegen.sdk.core.detached_symbols.argument import Argument
@@ -267,38 +266,11 @@ def insert_before(self, new_src: str, fix_indentation: bool = False, newline: bo
                 return first_node.insert_before(new_src, fix_indentation, newline, priority, dedupe)
         return super().insert_before(new_src, fix_indentation, newline, priority, dedupe)
 
-    def _post_move_import_cleanup(self, encountered_symbols, strategy):
-        # =====[ Remove any imports that are no longer used ]=====
-        from codegen.sdk.core.import_resolution import Import
-
-        for dep in self.dependencies:
-            if strategy != "duplicate_dependencies":
-                other_usages = [usage.usage_symbol for usage in dep.usages if usage.usage_symbol not in encountered_symbols]
-            else:
-                other_usages = [usage.usage_symbol for usage in dep.usages]
-            if isinstance(dep, Import):
-                dep.remove_if_unused()
-
-            elif isinstance(dep, Symbol):
-                usages_in_file = [symb for symb in other_usages if symb.file == self.file and not symb.get_transaction_if_pending_removal()]
-                if dep.get_transaction_if_pending_removal():
-                    if not usages_in_file and strategy != "add_back_edge":
-                        # We are going to assume there is only one such import
-                        if imp_list := [import_str for import_str in self.file._pending_imports if dep.name and dep.name in import_str]:
-                            if insert_import_list := [
-                                transaction
-                                for transaction in self.transaction_manager.queued_transactions[self.file.path]
-                                if imp_list[0] and transaction.new_content and imp_list[0] in transaction.new_content and transaction.transaction_order == TransactionPriority.Insert
-                            ]:
-                                self.transaction_manager.queued_transactions[self.file.path].remove(insert_import_list[0])
-                                self.file._pending_imports.remove(imp_list[0])
-
     def move_to_file(
         self,
         file: SourceFile,
         include_dependencies: bool = True,
         strategy: Literal["add_back_edge", "update_all_imports", "duplicate_dependencies"] = "update_all_imports",
-        cleanup_unused_imports: bool = True,
     ) -> None:
         """Moves the given symbol to a new file and updates its imports and references.
 
@@ -318,7 +290,7 @@ def move_to_file(
             AssertionError: If an invalid strategy is provided.
         """
         encountered_symbols = {self}
-        self._move_to_file(file, encountered_symbols, include_dependencies, strategy, cleanup_unused_imports)
+        self._move_to_file(file, encountered_symbols, include_dependencies, strategy)
 
     @noapidoc
     def _move_to_file(
@@ -327,7 +299,6 @@ def _move_to_file(
         encountered_symbols: set[Symbol | Import],
         include_dependencies: bool = True,
         strategy: Literal["add_back_edge", "update_all_imports", "duplicate_dependencies"] = "update_all_imports",
-        cleanup_unused_imports: bool = True,
     ) -> tuple[NodeId, NodeId]:
         """Helper recursive function for `move_to_file`"""
         from codegen.sdk.core.import_resolution import Import
@@ -420,9 +391,6 @@ def _move_to_file(
             # Delete the original symbol
             self.remove()
 
-        if cleanup_unused_imports:
-            self._post_move_import_cleanup(encountered_symbols, strategy)
-
     @property
     @reader
     @noapidoc