Skip to content

Bump pysquril to 0.7.0, remove export list limit #242

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

Merged
merged 3 commits into from
May 29, 2024
Merged

Bump pysquril to 0.7.0, remove export list limit #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3027e7d
remove export list limit
leondutoit May 29, 2024
917fb36
bump pysquril to 0.7.0
leondutoit May 29, 2024
93d29a4
remove all references to export_max_num_list
leondutoit May 29, 2024
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
11 changes: 5 additions & 6 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions tsdfileapi/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,6 @@ def initialize(self, backend: str, namespace: str, endpoint: str) -> None:
self.allow_info = self.backend_config["allow_info"]
self.allow_delete = self.backend_config["allow_delete"]
self.allow_rpc = self.backend_config.get("allow_rpc")
self.export_max = self.backend_config["export_max_num_list"]
self.has_posix_ownership = self.backend_config["has_posix_ownership"]
self.check_tenant = self.backend_config.get("check_tenant")
self.mq_config = self.backend_config.get("mq")
Expand Down Expand Up @@ -1609,10 +1608,6 @@ def list_files(self, path: str, tenant: str, root: str) -> None:
next_page = None
baseuri = self._base_uri()
nextref = f"{baseuri}?page={next_page}" if next_page else None
if self.export_max and len(files) > self.export_max:
raise ClientError(
f"number of files exceed configured maximum: {self.export_max}"
)
names = []
times = []
exportable = []
Expand Down
6 changes: 0 additions & 6 deletions tsdfileapi/config/config-test-container-postgres.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ backends:
allow_info: true
allow_list: true
allow_rpc: true
export_max_num_list: null
export_path: /tmp/pXX/apps
export_policy:
default:
Expand All @@ -75,7 +74,6 @@ backends:
allow_export: true
allow_info: true
allow_list: true
export_max_num_list: null
export_path: /file-api/tsdfileapi/data/tsd/pXX/export
export_policy:
default:
Expand All @@ -94,7 +92,6 @@ backends:
allow_export: true
allow_info: true
allow_list: true
export_max_num_list: null
export_path: /tmp/pXX/import
export_policy:
default:
Expand Down Expand Up @@ -124,7 +121,6 @@ backends:
allow_export: true
allow_info: true
allow_list: true
export_max_num_list: null
export_path: /tmp/pXX
export_policy:
default:
Expand All @@ -151,7 +147,6 @@ backends:
allow_info: true
allow_list: true
allow_rpc: true
export_max_num_list: null
export_path: /tmp/pXX/survey
export_policy:
default:
Expand All @@ -177,7 +172,6 @@ debug: true
default_file_owner: pXX-nobody
disallowed_start_chars: '~'
export_chunk_size: 512000
export_max_num_list: 100
jwt_secret: null
jwt_test_secret: jS25aQbePizfTsetg8LbFsNKl1W6wi4nQaBj705ofWA=
log_level: info
Expand Down
7 changes: 0 additions & 7 deletions tsdfileapi/config/config-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ valid_tenant_regex: ^[0-9a-z]+$
tenant_string_pattern: pXX
allowed_symlinks:
- "/tsd"
export_max_num_list: 100
export_chunk_size: 512000
max_body_size: 5368709120
default_file_owner: pXX-nobody
Expand Down Expand Up @@ -44,7 +43,6 @@ backends:
ensure_tenant_in_group_name: false
has_posix_ownership: false
import_path: /tmp/pXX
export_max_num_list: None
export_path: /tmp/pXX/export
apps_files:
allow_list: true
Expand All @@ -63,7 +61,6 @@ backends:
enabled: false
has_posix_ownership: false
import_path: /tmp/pXX
export_max_num_list: None
export_path: /tmp/pXX/export
files_export:
allow_list: true
Expand All @@ -82,7 +79,6 @@ backends:
enabled: false
has_posix_ownership: false
import_path: /tmp/pXX
export_max_num_list: None
export_path: /tmp/pXX/export
cluster:
allow_list: true
Expand All @@ -106,7 +102,6 @@ backends:
ensure_tenant_in_group_name: false
has_posix_ownership: false
import_path: /tmp/pXX/cluster/
export_max_num_list: None
export_path: /tmp/pXX/export
survey:
allow_list: true
Expand All @@ -128,7 +123,6 @@ backends:
ensure_tenant_in_group_name: false
has_posix_ownership: false
import_path: /tmp/pXX/survey
export_max_num_list: None
export_path: /tmp/pXX/export
backup_deletes:
backup_days: 90
Expand Down Expand Up @@ -162,7 +156,6 @@ backends:
enabled: false
has_posix_ownership: false
import_path: /tmp/pXX/store
export_max_num_list: None
export_path: /tmp/pXX/store
dbs:
survey:
Expand Down
3 changes: 1 addition & 2 deletions tsdfileapi/config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ requestor_claim_name: user
tenant_claim_name: proj
valid_tenant_regex: ^[0-9a-z]+$
tenant_string_pattern: pXX
export_max_num_list: 100
export_chunk_size: 512000
max_body_size: 5368709120
default_file_owner: pXX-nobody
Expand All @@ -17,4 +16,4 @@ jwt_test_secret: jS25aQbePizfTsetg8LbFsNKl1W6wi4nQaBj705ofWA=
jwt_secret: None
nacl_public: {'public': 'mZQEzkyi7bCvmDVfHGsU/7HX1+gT/R3PkSnyDU4OaiY=', 'private': 'fTEB1MZz8MskkZHSIM9ypxJc4e45Z8fmLGGXkUrp1hQ='}
log_level: info
backends: {'disk': {'store': {'has_posix_ownership': False, 'export_max_num_list': None, 'import_path': '/tmp/pXX', 'export_path': '/tmp/pXX', 'allow_export': True, 'allow_list': True, 'allow_info': True, 'allow_delete': True, 'export_policy': {'default': {'enabled': False}}, 'group_logic': {'default_url_group': None, 'default_memberships': ['pXX-member-group'], 'enabled': False}, 'request_hook': {'enabled': False}}, 'apps_files': {'has_posix_ownership': False, 'export_max_num_list': None, 'import_path': '/tmp/pXX', 'export_path': '/tmp/pXX', 'allow_export': True, 'allow_list': True, 'allow_info': True, 'allow_delete': True, 'export_policy': {'default': {'enabled': False}}, 'group_logic': {'default_url_group': None, 'default_memberships': ['pXX-member-group'], 'enabled': False}, 'request_hook': {'enabled': False}}}, 'dbs': {'apps_tables': {'db': {'engine': 'sqlite', 'path': '/tmp/pXX', 'table_structure': None, 'mq': None}}}}
backends: {'disk': {'store': {'has_posix_ownership': False, 'import_path': '/tmp/pXX', 'export_path': '/tmp/pXX', 'allow_export': True, 'allow_list': True, 'allow_info': True, 'allow_delete': True, 'export_policy': {'default': {'enabled': False}}, 'group_logic': {'default_url_group': None, 'default_memberships': ['pXX-member-group'], 'enabled': False}, 'request_hook': {'enabled': False}}, 'apps_files': {'has_posix_ownership': False, 'import_path': '/tmp/pXX', 'export_path': '/tmp/pXX', 'allow_export': True, 'allow_list': True, 'allow_info': True, 'allow_delete': True, 'export_policy': {'default': {'enabled': False}}, 'group_logic': {'default_url_group': None, 'default_memberships': ['pXX-member-group'], 'enabled': False}, 'request_hook': {'enabled': False}}}, 'dbs': {'apps_tables': {'db': {'engine': 'sqlite', 'path': '/tmp/pXX', 'table_structure': None, 'mq': None}}}}
1 change: 0 additions & 1 deletion tsdfileapi/config/example-file-api-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ requestor_claim_name: 'user'
tenant_claim_name: 'proj'
valid_tenant_regex: '^[0-9a-z]+$'
tenant_string_pattern: 'pXX'
export_max_num_list: 100
export_chunk_size: 512000
backup_days: 90
# endpoint backends
Expand Down
6 changes: 0 additions & 6 deletions tsdfileapi/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"tenant_claim_name": "proj",
"valid_tenant_regex": "^[0-9a-z]+$",
"tenant_string_pattern": "pXX",
"export_max_num_list": 100,
"export_chunk_size": 512000,
"max_body_size": 5368709120,
"default_file_owner": "pXX-nobody",
Expand Down Expand Up @@ -59,7 +58,6 @@
"disk": {
"publication": {
"has_posix_ownership": False,
"export_max_num_list": None,
"import_path": f"{TMP}/pXX",
"export_path": f"{TMP}/pXX",
"allow_export": True,
Expand All @@ -80,7 +78,6 @@
},
"apps_files": {
"has_posix_ownership": False,
"export_max_num_list": None,
"import_path": f"{TMP}/pXX/apps",
"export_path": f"{TMP}/pXX/apps",
"allow_export": True,
Expand All @@ -106,7 +103,6 @@
},
"survey": {
"has_posix_ownership": False,
"export_max_num_list": None,
"import_path": f"{TMP}/pXX/survey",
"export_path": f"{TMP}/pXX/survey",
"allow_export": True,
Expand Down Expand Up @@ -144,7 +140,6 @@
},
"files_import": {
"has_posix_ownership": True,
"export_max_num_list": None,
"import_path": f"{TMP}/pXX/import",
"export_path": f"{TMP}/pXX/import",
"allow_export": True,
Expand All @@ -170,7 +165,6 @@
},
"files_export": {
"has_posix_ownership": False,
"export_max_num_list": None,
"import_path": f"{TMP}/pXX",
"export_path": f"{os.getcwd()}/tsdfileapi/data/tsd/pXX/export",
"allow_export": True,
Expand Down
Loading