stac-fastapi-opensearch 5.0.0a0__tar.gz → 5.0.0a1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/PKG-INFO +1 -1
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/setup.py +2 -2
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi/opensearch/app.py +1 -1
- stac_fastapi_opensearch-5.0.0a1/stac_fastapi/opensearch/version.py +2 -0
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi_opensearch.egg-info/PKG-INFO +1 -1
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi_opensearch.egg-info/requires.txt +2 -2
- stac_fastapi_opensearch-5.0.0a0/stac_fastapi/opensearch/version.py +0 -2
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/README.md +0 -0
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/setup.cfg +0 -0
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi/opensearch/__init__.py +0 -0
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi/opensearch/config.py +12 -12
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi/opensearch/database_logic.py +0 -0
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi_opensearch.egg-info/SOURCES.txt +0 -0
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi_opensearch.egg-info/dependency_links.txt +0 -0
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi_opensearch.egg-info/entry_points.txt +0 -0
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi_opensearch.egg-info/not-zip-safe +0 -0
- {stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi_opensearch.egg-info/top_level.txt +0 -0
|
@@ -6,8 +6,8 @@ with open("README.md") as f:
|
|
|
6
6
|
desc = f.read()
|
|
7
7
|
|
|
8
8
|
install_requires = [
|
|
9
|
-
"stac-fastapi-core==5.0.
|
|
10
|
-
"sfeos-helpers==5.0.
|
|
9
|
+
"stac-fastapi-core==5.0.0a1",
|
|
10
|
+
"sfeos-helpers==5.0.0a1",
|
|
11
11
|
"opensearch-py~=2.8.0",
|
|
12
12
|
"opensearch-py[async]~=2.8.0",
|
|
13
13
|
"uvicorn~=0.23.0",
|
{stac_fastapi_opensearch-5.0.0a0 → stac_fastapi_opensearch-5.0.0a1}/stac_fastapi/opensearch/app.py
RENAMED
|
@@ -107,7 +107,7 @@ post_request_model = create_post_request_model(search_extensions)
|
|
|
107
107
|
api = StacApi(
|
|
108
108
|
title=os.getenv("STAC_FASTAPI_TITLE", "stac-fastapi-opensearch"),
|
|
109
109
|
description=os.getenv("STAC_FASTAPI_DESCRIPTION", "stac-fastapi-opensearch"),
|
|
110
|
-
api_version=os.getenv("STAC_FASTAPI_VERSION", "5.0.
|
|
110
|
+
api_version=os.getenv("STAC_FASTAPI_VERSION", "5.0.0a1"),
|
|
111
111
|
settings=settings,
|
|
112
112
|
extensions=extensions,
|
|
113
113
|
client=CoreClient(
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -40,18 +40,6 @@ def _es_config() -> Dict[str, Any]:
|
|
|
40
40
|
if http_compress:
|
|
41
41
|
config["http_compress"] = True
|
|
42
42
|
|
|
43
|
-
# Explicitly exclude SSL settings when not using SSL
|
|
44
|
-
if not use_ssl:
|
|
45
|
-
return config
|
|
46
|
-
|
|
47
|
-
# Include SSL settings if using https
|
|
48
|
-
config["ssl_version"] = ssl.PROTOCOL_SSLv23
|
|
49
|
-
config["verify_certs"] = get_bool_env("ES_VERIFY_CERTS", default=True)
|
|
50
|
-
|
|
51
|
-
# Include CA Certificates if verifying certs
|
|
52
|
-
if config["verify_certs"]:
|
|
53
|
-
config["ca_certs"] = os.getenv("CURL_CA_BUNDLE", certifi.where())
|
|
54
|
-
|
|
55
43
|
# Handle authentication
|
|
56
44
|
if (u := os.getenv("ES_USER")) and (p := os.getenv("ES_PASS")):
|
|
57
45
|
config["http_auth"] = (u, p)
|
|
@@ -65,6 +53,18 @@ def _es_config() -> Dict[str, Any]:
|
|
|
65
53
|
|
|
66
54
|
config["headers"] = headers
|
|
67
55
|
|
|
56
|
+
# Explicitly exclude SSL settings when not using SSL
|
|
57
|
+
if not use_ssl:
|
|
58
|
+
return config
|
|
59
|
+
|
|
60
|
+
# Include SSL settings if using https
|
|
61
|
+
config["ssl_version"] = ssl.PROTOCOL_SSLv23
|
|
62
|
+
config["verify_certs"] = get_bool_env("ES_VERIFY_CERTS", default=True)
|
|
63
|
+
|
|
64
|
+
# Include CA Certificates if verifying certs
|
|
65
|
+
if config["verify_certs"]:
|
|
66
|
+
config["ca_certs"] = os.getenv("CURL_CA_BUNDLE", certifi.where())
|
|
67
|
+
|
|
68
68
|
return config
|
|
69
69
|
|
|
70
70
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|