Skip to content

Rpatel/safe import #1220

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.

Sign up for GitHub

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

Merged
rushilpatel0 merged 3 commits into from
Aug 19, 2025
Merged

Rpatel/safe import #1220

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b14dc08
fix: safe import for create claude session method in startup hook
rushilpatel0 Aug 19, 2025
d79265c
fix: safe import
rushilpatel0 Aug 19, 2025
fb8f3d6
Merge branch 'develop' into rpatel/safe-import
codegen-team Aug 19, 2025
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
3 changes: 1 addition & 2 deletions src/codegen/cli/commands/claude/config/claude_session_hook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
import sys
from pathlib import Path

from codegen.cli.utils.org import resolve_org_id

# Add the codegen CLI to the path so we can import from it
Copy link
Contributor

@codegen-sh codegen-sh bot Aug 19, 2025

Choose a reason for hiding this comment

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

Logic error: resolve_org_id can be undefined if import fails

If the import inside the try block raises ImportError, only create_claude_session is set to None. resolve_org_id remains undefined and later usage (if org_id is None and resolve_org_id:) will raise a NameError, causing the hook to fail at runtime.

Suggested change
# Add the codegen CLI to the path so we can import from it
try:
from codegen.cli.commands.claude.claude_session_api import create_claude_session
from codegen.cli.utils.org import resolve_org_id
except ImportError:
create_claude_session = None
resolve_org_id = None

script_dir = Path(__file__).parent
codegen_cli_dir = script_dir.parent.parent.parent
sys.path.insert(0, str(codegen_cli_dir))

try:
from codegen.cli.commands.claude.claude_session_api import create_claude_session
from codegen.cli.utils.org import resolve_org_id
except ImportError:
create_claude_session = None

Expand Down
Loading