astro-otter 0.2.0__tar.gz → 1.0.1__tar.gz

{astro_otter-0.2.0/src/astro_otter.egg-info → astro_otter-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astro-otter
-Version: 0.2.0
+Version: 1.0.1
 Author-email: Noah Franz <nfranz@arizona.edu>
 License: MIT License
         
@@ -36,7 +36,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Development Status :: 2 - Pre-Alpha
-Requires-Python: <3.12,>=3.10
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy<2,>=1.20
@@ -45,6 +45,7 @@ Requires-Dist: pandas
 Requires-Dist: synphot
 Requires-Dist: typing-extensions
 Requires-Dist: pyarango
+Requires-Dist: tabulate
 Requires-Dist: matplotlib
 Requires-Dist: plotly
 Requires-Dist: astroquery
@@ -53,8 +54,9 @@ Requires-Dist: skypatrol
 Requires-Dist: fundamentals
 Requires-Dist: astro-datalab
 Requires-Dist: sparclclient
-Requires-Dist: astro-ghost
-Requires-Dist: pydantic
+Requires-Dist: pydantic>=2
+Requires-Dist: dustmaps
+Requires-Dist: dust_extinction
 Requires-Dist: pyreadline3; platform_system == "Windows"
 Provides-Extra: docs
 Requires-Dist: Sphinx>=3.0.0; extra == "docs"
@@ -68,6 +70,8 @@ Requires-Dist: autodoc_pydantic; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pytest-timeout; extra == "dev"
+Requires-Dist: python-semantic-release; extra == "dev"
 Dynamic: license-file
 
 # OTTER API
@@ -117,6 +121,7 @@ python3 -m pip install astro-otter
    ```
    git clone https://github.com/astro-otter/otter.git $OTTER_ROOT/otter
    git clone https://github.com/astro-otter/otterdb.git $OTTER_ROOT/otterdb
+   git clone https://github.com/astro-otter/otter-web.git $OTTER_ROOT/otter-web
    ```
 3. Install the NASA ADS Python API by following the instructions at https://ads.readthedocs.io/en/latest/#getting-started
 4. Install otter, the API for this database. From
@@ -125,13 +130,7 @@ python3 -m pip install astro-otter
    cd $OTTER_ROOT/otter
    python -m pip install -e .
    ```
-5. Process the data to build the local "database" (although it is really just a directory).
-   Then, you can build the "database" by running the
-   following commands:
-   ```
-   cd $OTTER_ROOT/otter/scripts/
-   python3 gen_summary_table.py --otterroot $OTTER_ROOT
-   ```
+5. Process the data to build the local copy of the database. Follow the instructions in the otterdb repo README.
 6. Easily access the data using the Otter code! In python:
   ```
   import os

{astro_otter-0.2.0 → astro_otter-1.0.1}/README.md

@@ -45,6 +45,7 @@ python3 -m pip install astro-otter
    ```
    git clone https://github.com/astro-otter/otter.git $OTTER_ROOT/otter
    git clone https://github.com/astro-otter/otterdb.git $OTTER_ROOT/otterdb
+   git clone https://github.com/astro-otter/otter-web.git $OTTER_ROOT/otter-web
    ```
 3. Install the NASA ADS Python API by following the instructions at https://ads.readthedocs.io/en/latest/#getting-started
 4. Install otter, the API for this database. From
@@ -53,13 +54,7 @@ python3 -m pip install astro-otter
    cd $OTTER_ROOT/otter
    python -m pip install -e .
    ```
-5. Process the data to build the local "database" (although it is really just a directory).
-   Then, you can build the "database" by running the
-   following commands:
-   ```
-   cd $OTTER_ROOT/otter/scripts/
-   python3 gen_summary_table.py --otterroot $OTTER_ROOT
-   ```
+5. Process the data to build the local copy of the database. Follow the instructions in the otterdb repo README.
 6. Easily access the data using the Otter code! In python:
   ```
   import os

{astro_otter-0.2.0 → astro_otter-1.0.1}/pyproject.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 license = {file = "LICENSE"}
 dynamic = ["version"]
 
-requires-python = ">=3.10,<3.12"
+requires-python = ">=3.9" #,<3.12"
 
 classifiers = [
   "License :: OSI Approved :: BSD License",
@@ -33,6 +33,7 @@ dependencies = [
   "synphot",
   "typing-extensions",
   "pyarango",
+  "tabulate",
 
   # for the plotting
   "matplotlib",
@@ -45,10 +46,13 @@ dependencies = [
   "fundamentals",
   "astro-datalab",
   "sparclclient",
-  "astro-ghost",
 
   # for the schema validation
-  "pydantic",
+  "pydantic>=2",
+
+  # for MW dust extinction corrections
+  "dustmaps",
+  "dust_extinction",
 
   # only for windows OS b/c it doesn't ship with readline by default
   'pyreadline3; platform_system == "Windows"'
@@ -74,6 +78,8 @@ docs = [
 dev = [
   "ruff", # linter
   "pre-commit", # enable pre-commit hooks
+  "pytest-timeout", # ignores tests that take to long
+  "python-semantic-release", # for automated semantic versioning
 ]
 
 [tool.setuptools.packages.find]
@@ -117,3 +123,70 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 [tool.ruff.format]
 indent-style = "space"
 quote-style = "double"
+
+[tool.semantic_release]
+assets = []
+build_command_env = []
+commit_message = "v{version}\n\nAutomatically generated by python-semantic-release [skip actions]"
+commit_parser = "conventional"
+logging_use_named_masks = false
+major_on_zero = true
+allow_zero_version = true
+no_git_verify = false
+tag_format = "v{version}"
+add_partial_tags = false
+version_variables = ["src/otter/_version.py:__version__"]
+
+[tool.semantic_release.branches.main]
+match = "main"
+prerelease_token = "rc"
+prerelease = false
+
+[tool.semantic_release.changelog]
+changelog_file = ""
+exclude_commit_patterns = []
+mode = "update"
+insertion_flag = "<!-- version list -->"
+template_dir = "templates"
+
+[tool.semantic_release.changelog.default_templates]
+changelog_file = "CHANGELOG.md"
+output_format = "md"
+mask_initial_release = true
+
+[tool.semantic_release.changelog.environment]
+block_start_string = "{%"
+block_end_string = "%}"
+variable_start_string = "{{"
+variable_end_string = "}}"
+comment_start_string = "{#"
+comment_end_string = "#}"
+trim_blocks = false
+lstrip_blocks = false
+newline_sequence = "\n"
+keep_trailing_newline = false
+extensions = []
+autoescape = false
+
+[tool.semantic_release.commit_author]
+env = "GIT_COMMIT_AUTHOR"
+default = "semantic-release <semantic-release>"
+
+[tool.semantic_release.commit_parser_options]
+minor_tags = ["feat"]
+patch_tags = ["fix", "perf"]
+other_allowed_tags = ["build", "chore", "ci", "docs", "style", "refactor", "test"]
+allowed_tags = ["feat", "fix", "perf", "build", "chore", "ci", "docs", "style", "refactor", "test"]
+default_bump_level = 0
+parse_squash_commits = true
+ignore_merge_commits = true
+
+[tool.semantic_release.remote]
+name = "origin"
+type = "github"
+ignore_token_for_push = false
+insecure = false
+
+[tool.semantic_release.publish]
+dist_glob_patterns = ["dist/*"]
+upload_to_vcs_release = true

{astro_otter-0.2.0 → astro_otter-1.0.1/src/astro_otter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astro-otter
-Version: 0.2.0
+Version: 1.0.1
 Author-email: Noah Franz <nfranz@arizona.edu>
 License: MIT License
         
@@ -36,7 +36,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Development Status :: 2 - Pre-Alpha
-Requires-Python: <3.12,>=3.10
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy<2,>=1.20
@@ -45,6 +45,7 @@ Requires-Dist: pandas
 Requires-Dist: synphot
 Requires-Dist: typing-extensions
 Requires-Dist: pyarango
+Requires-Dist: tabulate
 Requires-Dist: matplotlib
 Requires-Dist: plotly
 Requires-Dist: astroquery
@@ -53,8 +54,9 @@ Requires-Dist: skypatrol
 Requires-Dist: fundamentals
 Requires-Dist: astro-datalab
 Requires-Dist: sparclclient
-Requires-Dist: astro-ghost
-Requires-Dist: pydantic
+Requires-Dist: pydantic>=2
+Requires-Dist: dustmaps
+Requires-Dist: dust_extinction
 Requires-Dist: pyreadline3; platform_system == "Windows"
 Provides-Extra: docs
 Requires-Dist: Sphinx>=3.0.0; extra == "docs"
@@ -68,6 +70,8 @@ Requires-Dist: autodoc_pydantic; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pytest-timeout; extra == "dev"
+Requires-Dist: python-semantic-release; extra == "dev"
 Dynamic: license-file
 
 # OTTER API
@@ -117,6 +121,7 @@ python3 -m pip install astro-otter
    ```
    git clone https://github.com/astro-otter/otter.git $OTTER_ROOT/otter
    git clone https://github.com/astro-otter/otterdb.git $OTTER_ROOT/otterdb
+   git clone https://github.com/astro-otter/otter-web.git $OTTER_ROOT/otter-web
    ```
 3. Install the NASA ADS Python API by following the instructions at https://ads.readthedocs.io/en/latest/#getting-started
 4. Install otter, the API for this database. From
@@ -125,13 +130,7 @@ python3 -m pip install astro-otter
    cd $OTTER_ROOT/otter
    python -m pip install -e .
    ```
-5. Process the data to build the local "database" (although it is really just a directory).
-   Then, you can build the "database" by running the
-   following commands:
-   ```
-   cd $OTTER_ROOT/otter/scripts/
-   python3 gen_summary_table.py --otterroot $OTTER_ROOT
-   ```
+5. Process the data to build the local copy of the database. Follow the instructions in the otterdb repo README.
 6. Easily access the data using the Otter code! In python:
   ```
   import os

{astro_otter-0.2.0 → astro_otter-1.0.1}/src/astro_otter.egg-info/SOURCES.txt

@@ -24,5 +24,7 @@ tests/test_exceptions.py
 tests/test_host.py
 tests/test_otter.py
 tests/test_package.py
+tests/test_plotter.py
+tests/test_schema.py
 tests/test_transient.py
 tests/test_util.py

{astro_otter-0.2.0 → astro_otter-1.0.1}/src/astro_otter.egg-info/requires.txt

@@ -4,6 +4,7 @@ pandas
 synphot
 typing-extensions
 pyarango
+tabulate
 matplotlib
 plotly
 astroquery
@@ -12,8 +13,9 @@ skypatrol
 fundamentals
 astro-datalab
 sparclclient
-astro-ghost
-pydantic
+pydantic>=2
+dustmaps
+dust_extinction
 
 [:platform_system == "Windows"]
 pyreadline3
@@ -21,6 +23,8 @@ pyreadline3
 [dev]
 ruff
 pre-commit
+pytest-timeout
+python-semantic-release
 
 [docs]
 Sphinx>=3.0.0

{astro_otter-0.2.0 → astro_otter-1.0.1}/src/otter/__init__.py

@@ -7,6 +7,19 @@ from ._version import __version__
 # explicitly set the package variable to ensure relative import work
 __package__ = "otter"
 
+# lazy load the SFD dust map, if needed
+import os
+import dustmaps
+dustmaps_datapath = os.path.join(
+    os.path.dirname(dustmaps.__file__),
+    "data",
+    "sfd",
+    "SFD_dust_4096_sgp.fits"
+)
+if not os.path.exists(dustmaps_datapath):
+    import dustmaps.sfd
+    dustmaps.sfd.fetch()
+
 # import important stuff
 from .io.otter import Otter
 from .io.transient import Transient

{astro_otter-0.2.0 → astro_otter-1.0.1}/src/otter/_version.py

@@ -2,4 +2,4 @@
 Just define the package version in one place
 """
 
-__version__ = "0.2.0"
+__version__ = "1.0.1"

{astro_otter-0.2.0 → astro_otter-1.0.1}/src/otter/io/data_finder.py

@@ -602,8 +602,16 @@ class DataFinder(object):
         cone_search_res = qc.query(adql=adql, fmt="pandas")
 
         # then retrieve all of the spectra corresponding to those sparcl_ids
-        sparcl_ids = cone_search_res.sparcl_id.tolist()
-        res = client.retrieve(uuid_list=sparcl_ids, include=include)
+        spec_ids = cone_search_res.targetid.tolist()
+        if len(spec_ids) == 0:
+            logger.warn("Object not found in Sparcl!")
+            return
+
+        res = client.retrieve_by_specid(spec_ids, include=include)
+        if res.count == 0:
+            logger.warn("No Spectra available in sparcl!")
+            return
+
         all_spec = pd.concat([pd.DataFrame([record]) for record in res.records])
         return Table.from_pandas(all_spec)