github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-05-31 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

ArcGISLoader: Limit number of results in query (#10615)

Browse Source 
Description: this PR changes the `ArcGISLoader` to set
`return_all_records` to `False` when `result_record_count` is provided
as a keyword argument. Previously, `return_all_records` was `True` by
default and this made the API ignore `result_record_count`.

Issue: `ArcGISLoader` would ignore `result_record_count` unless user
also passed `return_all_records=False`.
This commit is contained in:
Joshua Sundance Bailey 2023-10-05 18:46:02 -04:00 committed by GitHub
parent f9df55f7d2
commit 790010703b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/langchain/langchain/document_loaders/arcgis_loader.py
View File

@ -27,7 +27,7 @@ class ArcGISLoader(BaseLoader):
where: str = "1=1", where: str = "1=1",
out_fields: Optional[Union[List[str], str]] = None, out_fields: Optional[Union[List[str], str]] = None,
return_geometry: bool = False, return_geometry: bool = False,
return_all_records: bool = True, result_record_count: Optional[int] = None,
lyr_desc: Optional[str] = None, lyr_desc: Optional[str] = None,
**kwargs: Any, **kwargs: Any,
): ):
@ -68,8 +68,19 @@ class ArcGISLoader(BaseLoader):
self.out_fields = ",".join(out_fields) self.out_fields = ",".join(out_fields)
self.return_geometry = return_geometry self.return_geometry = return_geometry
self.return_all_records = return_all_records
self.kwargs = kwargs self.result_record_count = result_record_count
self.return_all_records = not isinstance(result_record_count, int)
query_params = dict(
where=self.where,
out_fields=self.out_fields,
return_geometry=self.return_geometry,
return_all_records=self.return_all_records,
result_record_count=self.result_record_count,
)
query_params.update(kwargs)
self.query_params = query_params
def _get_layer_properties(self, lyr_desc: Optional[str] = None) -> dict: def _get_layer_properties(self, lyr_desc: Optional[str] = None) -> dict:
"""Get the layer properties from the FeatureLayer.""" """Get the layer properties from the FeatureLayer."""
@ -112,13 +123,7 @@ class ArcGISLoader(BaseLoader):
def lazy_load(self) -> Iterator[Document]: def lazy_load(self) -> Iterator[Document]:
"""Lazy load records from FeatureLayer.""" """Lazy load records from FeatureLayer."""
query_response = self.layer.query( query_response = self.layer.query(**self.query_params)
where=self.where,
out_fields=self.out_fields,
return_geometry=self.return_geometry,
return_all_records=self.return_all_records,
**self.kwargs,
)
features = (feature.as_dict for feature in query_response) features = (feature.as_dict for feature in query_response)
for feature in features: for feature in features:
attributes = feature["attributes"] attributes = feature["attributes"]
@ -135,8 +140,7 @@ class ArcGISLoader(BaseLoader):
if self.return_geometry: if self.return_geometry:
try: try:
geometry = feature["geometry"] metadata["geometry"] = feature["geometry"]
metadata.update({"geometry": geometry})
except KeyError: except KeyError:
warnings.warn( warnings.warn(
"Geometry could not be retrieved from the feature layer." "Geometry could not be retrieved from the feature layer."