developer-disk-image 0.1.0__tar.gz → 0.2.0__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.
Files changed (23) hide show
  1. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/PKG-INFO +1 -1
  2. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image/_version.py +2 -2
  3. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image/repo.py +28 -21
  4. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image.egg-info/PKG-INFO +1 -1
  5. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/.github/ISSUE_TEMPLATE/feature_request.md +0 -0
  6. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/.github/workflows/codeql.yml +0 -0
  7. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/.github/workflows/python-app.yml +0 -0
  8. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/.github/workflows/python-publish.yml +0 -0
  9. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/.gitignore +0 -0
  10. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/MANIFEST.in +0 -0
  11. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/README.md +0 -0
  12. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image/__init__.py +0 -0
  13. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image/exceptions.py +0 -0
  14. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image.egg-info/SOURCES.txt +0 -0
  15. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image.egg-info/dependency_links.txt +0 -0
  16. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image.egg-info/entry_points.txt +0 -0
  17. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image.egg-info/requires.txt +0 -0
  18. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/developer_disk_image.egg-info/top_level.txt +0 -0
  19. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/pyproject.toml +0 -0
  20. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/requirements.txt +0 -0
  21. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/setup.cfg +0 -0
  22. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/tests/__init__.py +0 -0
  23. {developer_disk_image-0.1.0 → developer_disk_image-0.2.0}/tests/test_repo.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: developer_disk_image
3
- Version: 0.1.0
3
+ Version: 0.2.0
4
4
  Summary: Download DeveloperDiskImage ans Personalized images from GitHub
5
5
  Author-email: doronz88 <doron88@gmail.com>
6
6
  Maintainer-email: doronz88 <doron88@gmail.com>
@@ -17,5 +17,5 @@ __version__: str
17
17
  __version_tuple__: VERSION_TUPLE
18
18
  version_tuple: VERSION_TUPLE
19
19
 
20
- __version__ = version = '0.1.0'
21
- __version_tuple__ = version_tuple = (0, 1, 0)
20
+ __version__ = version = '0.2.0'
21
+ __version_tuple__ = version_tuple = (0, 2, 0)
@@ -1,12 +1,11 @@
1
- import base64
2
1
  import dataclasses
3
2
  import json
4
3
  from datetime import datetime, timezone
5
- from typing import Mapping, Optional
4
+ from typing import Mapping, Optional, Union
6
5
 
7
6
  import requests
8
7
 
9
- from developer_disk_image.exceptions import GithubRateLimitExceededError
8
+ from developer_disk_image.exceptions import GithubRateLimitExceededError, DeveloperDiskImageException
10
9
 
11
10
  DEVELOPER_DISK_IMAGE_REPO_TREE_URL = \
12
11
  'https://api.github.com/repos/doronz88/DeveloperDiskImage/git/trees/main?recursive=true'
@@ -27,8 +26,9 @@ class PersonalizedImage:
27
26
 
28
27
  class DeveloperDiskImageRepository:
29
28
  @classmethod
30
- def create(cls) -> 'DeveloperDiskImageRepository':
31
- return cls(cls._query(DEVELOPER_DISK_IMAGE_REPO_TREE_URL)['tree'])
29
+ def create(cls, github_token: Optional[str] = None) -> 'DeveloperDiskImageRepository':
30
+ tree = cls._query(DEVELOPER_DISK_IMAGE_REPO_TREE_URL, github_token=github_token)['tree']
31
+ return cls(tree, github_token=github_token)
32
32
 
33
33
  def __init__(self, tree: Mapping, github_token: Optional[str] = None):
34
34
  self._path_urls = {}
@@ -56,23 +56,30 @@ class DeveloperDiskImageRepository:
56
56
  url = self._path_urls.get(path, {}).get('url')
57
57
  if url is None:
58
58
  return None
59
- return base64.b64decode(self._query(url, github_token=self.github_token)['content'])
59
+ return self._query(url, raw=True, github_token=self.github_token)
60
60
 
61
61
  @staticmethod
62
- def _query(url: str, github_token: Optional[str] = None) -> Mapping:
63
- headers = {}
62
+ def _query(url: str, raw: bool = False, github_token: Optional[str] = None) -> Union[Mapping, bytes]:
63
+ headers = {
64
+ 'X-GitHub-Api-Version': '2022-11-28',
65
+ 'Accept': 'application/vnd.github.raw+json' if raw else 'application/vnd.github+json'
66
+ }
64
67
  if github_token is not None:
65
- headers = {
66
- 'Accept': 'application/vnd.github+json',
67
- 'Authorization': 'Bearer ' + github_token,
68
- 'X-GitHub-Api-Version': '2022-11-28'
69
- }
68
+ headers['Authorization'] = 'Bearer ' + github_token
70
69
  response = requests.get(url, headers=headers)
71
- content = json.loads(response.text)
72
- if content.get('message', '').startswith('API rate limit exceeded'):
73
- reset_time = int(response.headers['X-RateLimit-Reset'])
74
- reset_utc = datetime.fromtimestamp(reset_time, timezone.utc)
75
- reset_local = reset_utc.astimezone()
76
- raise GithubRateLimitExceededError(
77
- f'GitHub API rate limit exceeded. Wait until {reset_local} or use a custom GitHub access token')
78
- return content
70
+ status_code = response.status_code
71
+ if status_code != 200:
72
+ # https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api?apiVersion=2022-11-28#exceeding-the-rate-limit
73
+ if (status_code == 403 or status_code == 429) and int(response.headers['x-ratelimit-remaining']) == 0:
74
+ reset_time = int(response.headers['x-ratelimit-reset'])
75
+ reset_utc = datetime.fromtimestamp(reset_time, timezone.utc)
76
+ reset_local = reset_utc.astimezone()
77
+ raise GithubRateLimitExceededError(
78
+ f'GitHub API: rate limit exceeded. Wait until {reset_local} or use a custom GitHub access token')
79
+ raise DeveloperDiskImageException(f'GitHub API: request failed: {response.status_code}')
80
+ if raw:
81
+ content = response.content
82
+ if content is None:
83
+ DeveloperDiskImageException('GitHub API: no content returned')
84
+ return content
85
+ return json.loads(response.text)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: developer_disk_image
3
- Version: 0.1.0
3
+ Version: 0.2.0
4
4
  Summary: Download DeveloperDiskImage ans Personalized images from GitHub
5
5
  Author-email: doronz88 <doron88@gmail.com>
6
6
  Maintainer-email: doronz88 <doron88@gmail.com>