Skip to content

fix: wrong HTTPError imported #468

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

Open
asmfstatoil wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: wrong HTTPError imported #468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99266c9
fix: wrong HTTPError import
asmfstatoil Feb 7, 2026
b8ea83d
fix: aspen, revert to token based auth if krb fails
asmfstatoil Feb 8, 2026
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
34 changes: 26 additions & 8 deletions tagreader/clients.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
from itertools import groupby
from operator import itemgetter
from typing import Any, Dict, List, Optional, Tuple, Union
from urllib.error import HTTPError

import numpy as np
import pandas as pd
import pytz
import requests

from tagreader.cache import BucketCache, SmartCache
from tagreader.logger import logger
Expand All @@ -21,6 +21,7 @@
PIHandlerWeb,
get_auth_aspen,
get_auth_pi,
get_url_aspen,
list_aspenone_sources,
list_piwebapi_sources,
)
Expand Down Expand Up @@ -121,24 +122,41 @@ def get_handler(
url: Optional[str],
options: Dict[str, Union[int, float, str]],
verify_ssl: Optional[Union[bool, str]],
auth: Optional[Any],
auth: Optional[Any] = None,
cache: Optional[Union[SmartCache, BucketCache]] = None,
):
if imstype is None:
orig_auth = auth
orig_url = url
try:
if datasource in list_aspenone_sources(
aspen_source = list_aspenone_sources(
url=None, auth=None, verify_ssl=verify_ssl
):
imstype = IMSType.ASPENONE
except HTTPError as e:
logger.debug(f"Could not list Aspenone sources: {e}")
)
except requests.exceptions.HTTPError:
# Try again using app registration auth
try:
auth = get_auth_aspen(False)
url = get_url_aspen(False)
aspen_source = list_aspenone_sources(
auth=auth, url=url, verify_ssl=verify_ssl
)
except requests.exceptions.HTTPError as e:
logger.debug(f"Could not list Aspenone sources: {e}")
aspen_source = []

if datasource in aspen_source:
imstype = IMSType.ASPENONE
else:
auth = orig_auth
url = orig_url

if imstype is None:
try:
if datasource in list_piwebapi_sources(
url=None, auth=None, verify_ssl=verify_ssl
):
imstype = IMSType.PIWEBAPI
except HTTPError as e:
except requests.exceptions.HTTPError as e:
logger.debug(f"Could not list PI sources: {e}")

if imstype == IMSType.PIWEBAPI:
Expand Down
Loading