Skip to content

Commit

Permalink
Merge pull request #409 from airtai/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
kumaranvpl committed Mar 5, 2024
2 parents dbc883d + 96616fc commit fd3e657
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions google_ads/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ async def _remove_existing_create_new_ad_group_criterion(
ad_group_criterion_copy = await _get_existing_ad_group_criterion(
user_id=user_id,
customer_id=ad_group_criterion_model.customer_id,
criterion_id=ad_group_criterion_model.criterion_id,
criterion_id=ad_group_criterion_model.criterion_id, # type: ignore [arg-type]
)

ad_group_criterion_model.status = (
Expand Down Expand Up @@ -1153,7 +1153,7 @@ async def update_campaigns_negative_keywords(
campaign_criterion_copy = await _get_existing_campaign_criterion(
user_id=user_id,
customer_id=campaign_criterion_model.customer_id,
criterion_id=campaign_criterion_model.criterion_id,
criterion_id=campaign_criterion_model.criterion_id, # type: ignore [arg-type]
)

_copy_keyword_text_and_match_type(
Expand Down
14 changes: 8 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ lint = [
"mypy==1.8.0",
"black==24.2.0",
"isort>=5",
"ruff==0.1.14",
"ruff==0.3.0",
"pyupgrade-directories",
"bandit==1.7.7",
"semgrep==1.52.0",
Expand All @@ -86,10 +86,10 @@ testing = [
]

agents = [
"fastapi==0.109.0",
"fastapi==0.110.0",
"APScheduler==3.10.4",
"prisma==0.12.0",
"google-ads==22.1.0",
"google-ads==23.1.0",
"httpx==0.27.0",
"uvicorn==0.27.1",
"python-dotenv==1.0.1",
Expand All @@ -99,7 +99,7 @@ agents = [
"pandas>=2.1",
"fastcore==1.5.29",
"asyncer==0.0.5",
"pydantic==2.5.3",
"pydantic==2.6.3",
"markdownify==0.11.6",
"tenacity==8.2.3",
]
Expand Down Expand Up @@ -164,6 +164,8 @@ include = '\.pyi?$'
fix = true
line-length = 88
target-version = "py38"

[tool.ruff.lint]
select = [
"E", # pycodestyle errors
"W", # pycodestyle warnings
Expand All @@ -178,10 +180,10 @@ ignore = [
"C901", # too complex
]

[tool.ruff.flake8-bugbear]
[tool.ruff.lint.flake8-bugbear]
extend-immutable-calls = ["fastapi.Depends"]

[tool.ruff.pydocstyle]
[tool.ruff.lint.pydocstyle]
convention = "google"

[tool.pytest.ini_options]
Expand Down
2 changes: 1 addition & 1 deletion scripts/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pyup_dirs --py38-plus --recursive captn google_ads openai_agent tests applicatio
# isort captn captn_agents google_ads openai_agent application.py

echo "Running ruff..."
ruff captn google_ads openai_agent tests application.py --fix
ruff check captn google_ads openai_agent tests application.py --fix

echo "Running black..."
black captn google_ads openai_agent tests application.py

0 comments on commit fd3e657

Please sign in to comment.