Compare commits

...

2 Commits

Author SHA1 Message Date
Logan Markewich d9616a58a1 fix publish workflow 2025-02-11 17:36:50 -06:00
Logan Markewich ea4d9361ee add organization id and project id as args 2025-02-11 17:33:33 -06:00
4 changed files with 29 additions and 9 deletions
-4
View File
@@ -36,16 +36,12 @@ jobs:
- name: Build and publish llama-cloud-services
uses: JRubics/poetry-publish@v2.1
with:
poetry_version: ${{ env.POETRY_VERSION }}
python_version: ${{ env.PYTHON_VERSION }}
pypi_token: ${{ secrets.LLAMA_PARSE_PYPI_TOKEN }}
poetry_install_options: "--without dev"
- name: Build and publish llama-parse
uses: JRubics/poetry-publish@v2.1
with:
poetry_version: ${{ env.POETRY_VERSION }}
python_version: ${{ env.PYTHON_VERSION }}
working_directory: "llama_parse"
pypi_token: ${{ secrets.LLAMA_PARSE_PYPI_TOKEN }}
poetry_install_options: "--without dev"
+26 -2
View File
@@ -37,6 +37,21 @@ JOB_STATUS_ROUTE = "/api/parsing/job/{job_id}"
JOB_UPLOAD_ROUTE = "/api/parsing/upload"
def build_url(
base_url: str, organization_id: Optional[str], project_id: Optional[str]
) -> str:
query_params = {}
if organization_id:
query_params["organization_id"] = organization_id
if project_id:
query_params["project_id"] = project_id
if query_params:
return base_url + "?" + "&".join([f"{k}={v}" for k, v in query_params.items()])
return base_url
class LlamaParse(BasePydanticReader):
"""A smart-parser for files."""
@@ -50,6 +65,14 @@ class LlamaParse(BasePydanticReader):
default=DEFAULT_BASE_URL,
description="The base URL of the Llama Parsing API.",
)
organization_id: Optional[str] = Field(
default=None,
description="The organization ID for the LlamaParse API.",
)
project_id: Optional[str] = Field(
default=None,
description="The project ID for the LlamaParse API.",
)
check_interval: int = Field(
default=1,
description="The interval in seconds to check if the parsing is done.",
@@ -639,7 +662,7 @@ class LlamaParse(BasePydanticReader):
if self.page_suffix is not None:
data["page_suffix"] = self.page_suffix
if self.parsing_instruction is not None:
if self.parsing_instruction:
print(
"WARNING: parsing_instruction is deprecated. Use complemental_formatting_instruction or content_guideline_instruction instead."
)
@@ -706,7 +729,8 @@ class LlamaParse(BasePydanticReader):
data["gpt4o_api_key"] = self.gpt4o_api_key
try:
resp = await self.aclient.post(JOB_UPLOAD_ROUTE, files=files, data=data) # type: ignore
url = build_url(JOB_UPLOAD_ROUTE, self.organization_id, self.project_id)
resp = await self.aclient.post(url, files=files, data=data) # type: ignore
resp.raise_for_status() # this raises if status is not 2xx
return resp.json()["id"]
except httpx.HTTPStatusError as err: # this catches it
+2 -2
View File
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
[tool.poetry]
name = "llama-parse"
version = "0.6.0"
version = "0.6.1"
description = "Parse files into RAG-Optimized formats."
authors = ["Logan Markewich <logan@llamaindex.ai>"]
license = "MIT"
@@ -13,7 +13,7 @@ packages = [{include = "llama_parse"}]
[tool.poetry.dependencies]
python = ">=3.9,<4.0"
llama-cloud-services = "*"
llama-cloud-services = ">=0.6.1"
[tool.poetry.group.dev.dependencies]
pytest = "^8.0.0"
+1 -1
View File
@@ -8,7 +8,7 @@ python_version = "3.10"
[tool.poetry]
name = "llama-cloud-services"
version = "0.6.0"
version = "0.6.1"
description = "Tailored SDK clients for LlamaCloud services."
authors = ["Logan Markewich <logan@runllama.ai>"]
license = "MIT"