Skip to content

Stage to Prod #59

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
sujata-m merged 10 commits into from
Aug 11, 2025
Merged

Stage to Prod #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cbb4083
Fixed task 1564 and 1566
sujata-m Dec 23, 2024
aa4193d
Merge pull request #52 from TaskarCenterAtUW/feature-1564
sujata-m Dec 24, 2024
6bbefde
Fixed task 1654 and 2040
sujata-m Jun 18, 2025
70f8db6
Merge pull request #54 from TaskarCenterAtUW/feature-2040
sujata-m Jun 23, 2025
9836abe
Merge branch 'stage' into feature-resolve-conflicts
sujata-m Jun 30, 2025
cad4bcd
Merge pull request #56 from TaskarCenterAtUW/feature-resolve-conflicts
sujata-m Jun 30, 2025
eb454cf
Merge pull request #55 from TaskarCenterAtUW/dev
sujata-m Jul 1, 2025
55263fd
Merge branch 'main' into feature-resolve-conflicts-08-08
sujata-m Aug 8, 2025
4f7485e
Merge pull request #60 from TaskarCenterAtUW/feature-resolve-conflict…
sujata-m Aug 8, 2025
854cd00
Merge pull request #61 from TaskarCenterAtUW/dev
sujata-m Aug 8, 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: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ The project is built on Python with FastAPI framework. All the regular nuances f
- Connecting this to cloud will need the following in the `.env` file

```bash
PROVIDER=Azure
QUEUECONNECTION=xxx
STORAGECONNECTION=xxx
FORMATTER_TOPIC=xxx
FORMATTER_SUBSCRIPTION=xxx
FORMATTER_UPLOAD_TOPIC=xxx
CONTAINER_NAME=xxx
MAX_CONCURRENT_MESSAGES=xx
MAX_CONCURRENT_MESSAGES=xx # Optional if not passed defaults to 2
```

The application connect with the `STORAGECONNECTION` string provided in `.env` file and validates downloaded zipfile using `python-osw-validation` package.
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ pydantic==1.10.4
python-ms-core==0.0.23
uvicorn==0.20.0
html_testRunner==1.2.1
osm-osw-reformatter==0.2.6
osm-osw-reformatter==0.2.8
numpy==1.26.4
23 changes: 19 additions & 4 deletions src/service/osw_formatter_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
)
from python_ms_core.core.queue.models.queue_message import QueueMessage
import threading
import osm_osw_reformatter

logging.basicConfig()
logger = logging.getLogger("OSW_FORMATTER")
Expand Down Expand Up @@ -173,11 +174,18 @@ def send_status(self, result: ValidationResult, upload_message: OSWValidationMes
upload_message.data.message = result.validation_message
if upload_url:
upload_message.data.formatted_url = upload_url

resp_data = upload_message.data.to_json()
Copy link
Collaborator

@susrisha susrisha Aug 8, 2025

Choose a reason for hiding this comment

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

this is changing the response message format from this service back. How to ensure the integrity of the message? there is no unit test to check the sanity of the response message

resp_data['package'] = {
'python-ms-core': Core.__version__,
'osm-osw-reformatter': osm_osw_reformatter.__version__

}
data = QueueMessage.data_from(
{
"messageId": upload_message.message_id,
"messageType": upload_message.message_type,
"data": upload_message.data.to_json(),
'messageId': upload_message.message_id,
'messageType': upload_message.message_type,
'data': resp_data
}
)
try:
Expand Down Expand Up @@ -252,10 +260,17 @@ def process_on_demand_format(self, request: OSWOnDemandRequest):

def send_on_demand_response(self, response: OSWOnDemandResponse):
logger.info(f"Sending response for {response.data.jobId}")
resp_data = asdict(response.data)
resp_data['package'] = {
'python-ms-core': Core.__version__,
'osm-osw-reformatter': osm_osw_reformatter.__version__

}

data = QueueMessage.data_from({
"messageId": response.messageId,
"messageType": response.messageType,
'data': asdict(response.data)
'data': resp_data
})
publishing_topic_name = self._settings.event_bus.formatter_topic or ""
publishing_topic = self.core.get_topic(topic_name=publishing_topic_name)
Expand Down
Loading