Skip to content
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

Jump to bottom

CV2-3435 add param to env file test for queue prefix #43

Merged
merged 2 commits into from
Oct 12, 2023
Merged

CV2-3435 add param to env file test for queue prefix #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c400b2
CV2-3435 add param to env file test for queue prefix
DGaffney Oct 11, 2023
22599f9
fix more prefix garbage
DGaffney Oct 12, 2023
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
1 change: 1 addition & 0 deletions .env_file.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
QUEUE_PREFIX=dev_
PRESTO_PORT=8000
DEPLOY_ENV=local
# MODEL_NAME=mean_tokens.Model
Expand Down
4 changes: 3 additions & 1 deletion lib/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from lib.logger import logger
from lib import schemas
from lib.sentry import sentry_sdk
from lib.helpers import get_setting, get_environment_setting

app = FastAPI()

Expand All @@ -31,8 +32,9 @@ async def post_url(url: str, params: dict) -> Dict[str, Any]:
@app.post("/process_item/{process_name}")
def process_item(process_name: str, message: Dict[str, Any]):
logger.info(message)
queue_prefix = get_setting("", "QUEUE_PREFIX").replace(".", "__")
queue = QueueWorker.create(process_name)
queue.push_message(process_name, schemas.Message(body=message))
queue.push_message(f"{queue_prefix}{process_name}", schemas.Message(body=message))
return {"message": "Message pushed successfully", "queue": process_name, "body": message}

@app.post("/trigger_callback")
Expand Down
5 changes: 2 additions & 3 deletions lib/queue/queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import boto3
import botocore

from lib.helpers import get_setting, get_environment_setting
from lib.helpers import get_environment_setting
from lib.logger import logger
from lib import schemas
SQS_MAX_BATCH_SIZE = 10
Expand Down Expand Up @@ -154,6 +154,5 @@ def push_message(self, queue_name: str, message: schemas.Message) -> schemas.Mes
"""
Actual SQS logic for pushing a message to a queue
"""
queue_prefix = get_setting("", "QUEUE_PREFIX").replace(".", "__")
self.find_queue_by_name(f"{queue_prefix}{queue_name}").send_message(MessageBody=json.dumps(message.dict()))
self.find_queue_by_name(queue_name).send_message(MessageBody=json.dumps(message.dict()))
return message
Loading