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
26 changes: 15 additions & 11 deletions backend/python/app/sources/client/http/http_client.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Optional

import httpx # type: ignore

from app.sources.client.http.http_request import HTTPRequest
from app.sources.client.http.http_response import HTTPResponse
from app.sources.client.iclient import IClient
Expand All @@ -13,7 +12,7 @@ def __init__(
token: str,
token_type: str = "Bearer",
timeout: float = 30.0,
follow_redirects: bool = True
follow_redirects: bool = True,
) -> None:
self.headers = {
"Authorization": f"{token_type} {token}",
Expand All @@ -30,8 +29,7 @@ async def _ensure_client(self) -> httpx.AsyncClient:
"""Ensure client is created and available"""
if self.client is None:
self.client = httpx.AsyncClient(
timeout=self.timeout,
follow_redirects=self.follow_redirects
timeout=self.timeout, follow_redirects=self.follow_redirects
)
return self.client

Expand All @@ -43,28 +41,34 @@ async def execute(self, request: HTTPRequest, **kwargs) -> HTTPResponse:
Returns:
A HTTPResponse object containing the response from the server
"""
url = f"{request.url.format(**request.path_params)}"
# Use format only if path_params is non-empty; fast path
url = request.url
if request.path_params:
# dict lookup is fast; only format if necessary
url = url.format(**request.path_params)

client = await self._ensure_client()

# Merge client headers with request headers (request headers take precedence)
merged_headers = {**self.headers, **request.headers}
request_kwargs = {
"params": request.query_params,
"headers": merged_headers,
**kwargs
**kwargs,
}

if isinstance(request.body, dict):
body = request.body
if isinstance(body, dict):
# Check if Content-Type indicates form data
content_type = request.headers.get("Content-Type", "").lower()
if "application/x-www-form-urlencoded" in content_type:
# Send as form data
request_kwargs["data"] = request.body
request_kwargs["data"] = body
else:
# Send as JSON (default behavior)
request_kwargs["json"] = request.body
elif isinstance(request.body, bytes):
request_kwargs["content"] = request.body
request_kwargs["json"] = body
elif isinstance(body, bytes):
request_kwargs["content"] = body

response = await client.request(request.method, url, **request_kwargs)
return HTTPResponse(response)
Expand Down
70 changes: 45 additions & 25 deletions backend/python/app/sources/external/jira/jira.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
from app.sources.client.http.http_request import HTTPRequest
from app.sources.client.http.http_response import HTTPResponse
from app.sources.client.jira.jira import JiraClient
from codeflash.code_utils.codeflash_wrap_decorator import \
codeflash_performance_async


class JiraDataSource:
def __init__(self, client: JiraClient) -> None:
"""Default init for the connector-specific data source."""
self._client = client.get_client()
if self._client is None:
_client = client.get_client()
if _client is None:
raise ValueError('HTTP client is not initialized')
self._client = _client
try:
self.base_url = self._client.get_base_url().rstrip('/') # type: ignore [valid method]
self.base_url = _client.get_base_url().rstrip('/') # type: ignore [valid method]
except AttributeError as exc:
raise ValueError('HTTP client does not have get_base_url method') from exc

Expand Down Expand Up @@ -6463,6 +6466,7 @@ async def get_issue_property_keys(
resp = await self._client.execute(req)
return resp

@codeflash_performance_async
async def delete_issue_property(
self,
issueIdOrKey: str,
Expand Down Expand Up @@ -8905,26 +8909,33 @@ async def delete_issue_type_scheme(
issueTypeSchemeId: int,
headers: Optional[Dict[str, Any]] = None
) -> HTTPResponse:
"""Auto-generated from OpenAPI: Delete issue type scheme\n\nHTTP DELETE /rest/api/3/issuetypescheme/{issueTypeSchemeId}\nPath params:\n - issueTypeSchemeId (int)"""
if self._client is None:
"""Auto-generated from OpenAPI: Delete issue type scheme

HTTP DELETE /rest/api/3/issuetypescheme/{issueTypeSchemeId}
Path params:
- issueTypeSchemeId (int)"""
client = self._client
if client is None:
raise ValueError('HTTP client is not initialized')
_headers: Dict[str, Any] = dict(headers or {})
_path: Dict[str, Any] = {
'issueTypeSchemeId': issueTypeSchemeId,
}
_query: Dict[str, Any] = {}
_body = None
# Only create new dict if headers is non-empty
_headers: Dict[str, Any] = dict(headers) if headers else {}
_path: Dict[str, Any] = {'issueTypeSchemeId': issueTypeSchemeId}
# _query and _body are always empty here
rel_path = '/rest/api/3/issuetypescheme/{issueTypeSchemeId}'
url = self.base_url + _safe_format_url(rel_path, _path)
# Pre-convert only if dictionary is non-empty for performance
hdr_conv = _as_str_dict(_headers) if _headers else {}
path_conv = _as_str_dict(_path)
query_conv = {} # Already empty, skip conversion
req = HTTPRequest(
method='DELETE',
url=url,
headers=_as_str_dict(_headers),
path_params=_as_str_dict(_path),
query_params=_as_str_dict(_query),
body=_body,
headers=hdr_conv,
path_params=path_conv,
query_params=query_conv,
body=None,
)
resp = await self._client.execute(req)
resp = await client.execute(req)
return resp

async def update_issue_type_scheme(
Expand Down Expand Up @@ -9979,19 +9990,25 @@ async def set_locale(
resp = await self._client.execute(req)
return resp

@codeflash_performance_async
async def get_current_user(
self,
expand: Optional[str] = None,
headers: Optional[Dict[str, Any]] = None
) -> HTTPResponse:
"""Auto-generated from OpenAPI: Get current user\n\nHTTP GET /rest/api/3/myself\nQuery params:\n - expand (str, optional)"""
"""Auto-generated from OpenAPI: Get current user

HTTP GET /rest/api/3/myself
Query params:
- expand (str, optional)"""
if self._client is None:
raise ValueError('HTTP client is not initialized')
_headers: Dict[str, Any] = dict(headers or {})

# Use headers as-is if not None, else an empty dict (no mutation, safe).
_headers: Dict[str, Any] = headers if headers is not None else {}
_path: Dict[str, Any] = {}
_query: Dict[str, Any] = {}
if expand is not None:
_query['expand'] = expand
# Avoid unnecessary dict creation, direct assignment for expand param.
_query: Dict[str, Any] = {'expand': expand} if expand is not None else {}
_body = None
rel_path = '/rest/api/3/myself'
url = self.base_url + _safe_format_url(rel_path, _path)
Expand Down Expand Up @@ -20081,9 +20098,9 @@ async def put_forge_app_property(

# ---- Helpers used by generated methods ----
def _safe_format_url(template: str, params: Dict[str, object]) -> str:
class _SafeDict(dict):
def __missing__(self, key: str) -> str:
return '{' + key + '}'
# Fast path: skip formatting if there's nothing to format
if '{' not in template:
return template
try:
return template.format_map(_SafeDict(params))
except Exception:
Expand All @@ -20102,4 +20119,7 @@ def _serialize_value(v: Union[bool, str, int, float, list, tuple, set, None]) ->
return _to_bool_str(v)

def _as_str_dict(d: Dict[str, Any]) -> Dict[str, str]:
return {str(k): _serialize_value(v) for k, v in (d or {}).items()}
# Use list comprehension and local function references for speed
# Avoid conversion for empty dicts at the caller for efficiency
ser = _serialize_value
return {str(k): ser(v) for k, v in d.items()}