Skip to content

Commit e8382d3

Browse files
Merge branch 'main' into dev
2 parents 9664143 + a60bf67 commit e8382d3

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Customers have the option to deploy this solution with PostgreSQL or Cosmos DB.
176176

177177

178178
To review PostgreSQL configuration overview and steps, follow the link [here](docs/postgreSQL.md).
179-
![Solution Architecture - Chat with your data PostgreSQL](/docs/images/architrecture_pg.png)
179+
![Solution Architecture - Chat with your data PostgreSQL](/docs/images/architecture_pg.png)
180180

181181
To review Cosmos DB configuration overview and steps, follow the link [here](docs/employee_assistance.md).
182182
![Solution Architecture - Chat with your data CosmosDB](/docs/images/architecture_cdb.png)

code/backend/batch/batch_push_results.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
bp_batch_push_results = func.Blueprint()
1313
logger = logging.getLogger(__name__)
1414
logger.setLevel(level=os.environ.get("LOGLEVEL", "INFO").upper())
15+
queue_name = os.environ.get("DOCUMENT_PROCESSING_QUEUE_NAME", "doc-processing")
1516

1617

1718
def _get_file_name_from_message(message_body) -> str:
@@ -24,7 +25,7 @@ def _get_file_name_from_message(message_body) -> str:
2425

2526

2627
@bp_batch_push_results.queue_trigger(
27-
arg_name="msg", queue_name="doc-processing", connection="AzureWebJobsStorage"
28+
arg_name="msg", queue_name=queue_name, connection="AzureWebJobsStorage"
2829
)
2930
def batch_push_results(msg: func.QueueMessage) -> None:
3031
message_body = json.loads(msg.get_body().decode("utf-8"))

code/tests/functional/resources/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Why is this here?
22

33
The file [9b5ad71b2ce5302211f9c61530b329a4922fc6a4](9b5ad71b2ce5302211f9c61530b329a4922fc6a4) is required to stop the
4-
tiktoken library from making a call out to the internet to retrive the required encoder.
4+
tiktoken library from making a call out to the internet to retrieve the required encoder.
55

66
You can see where this happens in the code here https://github.com/openai/tiktoken/blob/1b9faf2779855124f05174adf1383e53689ed94b/tiktoken/load.py#L25,
77
which calls out to https://openaipublic.blob.core.windows.net/encodings/cl100k_base.tiktoken.

docs/RELEASE_GUIDELINES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This repository uses GitHub's in-built [Releases](https://docs.github.com/en/rep
1212

1313
# Automated releases
1414

15-
In order to automate the generation of a changelog, the creation of a release, and the bumping of a version number, we use the [Conventional Changelog Action](https://github.com/TriPSs/conventional-changelog-action).
15+
In order to automate the generation of a change log, the creation of a release, and the bumping of a version number, we use the [Conventional Changelog Action](https://github.com/TriPSs/conventional-changelog-action).
1616

1717
It works by inferring from the commit history what changes have been made, and hence what version should be assigned. This is why it is important for Pull Request titles to adhere to the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification, which many repositories use. This convention uses types such as `docs`, `fix`, `feat`, etc to label commits and PRs.
1818

docs/design/adrs/2024-05-02-enable-project-versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Use Github Releases to manage project versioning
1+
# Use GitHub Releases to manage project versioning
22

33
* **Status:** approved
44
* **Proposer:** @frtibble
File renamed without changes.

0 commit comments

Comments
 (0)