Skip to content

fix: add isort linting and instructions for configuration in vscode #4

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.

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

Merged
merged 1 commit into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,24 @@ r.diff()
### Apply a Check to a Run

TODO

## Development

Install the following VSCode extensions:

- Ruff
- isort

And add the following lines to `User Settings (JSON)`:

```
"[python]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "charliermarsh.ruff",
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit",
},
},
```

To make sure your code is linted properly on save.
13 changes: 5 additions & 8 deletions nominal/__init__.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
from .nominal import (
Dataset as Dataset,
Ingest as Ingest,
Run as Run,
)
import os

# Allows:
# import nominal as nm
# nm.cloud ...
# nm.data ...
from . import data as data
from . import cloud as cloud

import os
from . import data as data
from .nominal import Dataset as Dataset
from .nominal import Ingest as Ingest
from .nominal import Run as Run

os.environ["NOMINAL_BASE_URL"] = "https://api-staging.gov.nominal.io/api"
9 changes: 5 additions & 4 deletions nominal/_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
Internal utility functions for Nominal Python client
"""

import requests
from requests.utils import CaseInsensitiveDict
from conjure_python_client import ServiceConfiguration
import random
import string
from datetime import datetime
from typing import TypeVar, Type
from typing import Type, TypeVar

import requests
from conjure_python_client import ServiceConfiguration
from requests.utils import CaseInsensitiveDict


def default_filename(nominal_file_class):
Expand Down
2 changes: 1 addition & 1 deletion nominal/cloud/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"""

import os

import keyring as kr
from rich import print


ENDPOINTS = dict(
file_upload="{}/upload/v1/upload-file?fileName={}",
dataset_upload="{}/ingest/v1/trigger-ingest-v2",
Expand Down
3 changes: 2 additions & 1 deletion nominal/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ def penguins():


def _get_dataset(d, ext=".csv"):
import polars
import os

import polars

return polars.read_csv(
os.path.join(
os.path.dirname(os.path.dirname(__file__)),
Expand Down
13 changes: 8 additions & 5 deletions nominal/nominal.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
from rich import print

from ._api.ingest.ingest_api import (
AbsoluteTimestamp,
CustomTimestamp,
IngestService,
IngestSource,
S3IngestSource,
TimestampMetadata,
TimestampType,
TriggerIngest,
AbsoluteTimestamp,
CustomTimestamp,
)
from ._utils import PayloadFactory, create_service, default_filename
from .cloud import ENDPOINTS, _auth_help_blurb, get_app_base_url, get_base_url
Expand Down Expand Up @@ -180,9 +180,12 @@ def upload(self, overwrite: bool = False):
source=IngestSource(S3IngestSource(self.s3_path)),
dataset_name=self.filename,
dataset_description=self.description,
timestamp_metadata=TimestampMetadata("_python_datetime", TimestampType(
absolute=AbsoluteTimestamp(custom_format=CustomTimestamp("yyyy-MM-dd['T']HH:mm:ss.SSSSSS", 0))
)),
timestamp_metadata=TimestampMetadata(
"_python_datetime",
TimestampType(
absolute=AbsoluteTimestamp(custom_format=CustomTimestamp("yyyy-MM-dd['T']HH:mm:ss.SSSSSS", 0))
),
),
)
resp = ingest.trigger_ingest(TOKEN, ingest_request)

Expand Down
Loading