umap-project 2.8.2__py3-none-any.whl → 2.9.0__py3-none-any.whl

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.

Potentially problematic release.


This version of umap-project might be problematic. Click here for more details.

Files changed (260) hide show
  1. umap/__init__.py +1 -1
  2. umap/admin.py +15 -2
  3. umap/asgi.py +12 -7
  4. umap/context_processors.py +1 -0
  5. umap/locale/br/LC_MESSAGES/django.mo +0 -0
  6. umap/locale/br/LC_MESSAGES/django.po +111 -67
  7. umap/locale/cs_CZ/LC_MESSAGES/django.mo +0 -0
  8. umap/locale/cs_CZ/LC_MESSAGES/django.po +110 -66
  9. umap/locale/el/LC_MESSAGES/django.mo +0 -0
  10. umap/locale/el/LC_MESSAGES/django.po +129 -85
  11. umap/locale/en/LC_MESSAGES/django.po +103 -60
  12. umap/locale/es/LC_MESSAGES/django.mo +0 -0
  13. umap/locale/es/LC_MESSAGES/django.po +114 -69
  14. umap/locale/fr/LC_MESSAGES/django.mo +0 -0
  15. umap/locale/fr/LC_MESSAGES/django.po +105 -61
  16. umap/locale/gl/LC_MESSAGES/django.mo +0 -0
  17. umap/locale/gl/LC_MESSAGES/django.po +216 -171
  18. umap/locale/it/LC_MESSAGES/django.mo +0 -0
  19. umap/locale/it/LC_MESSAGES/django.po +142 -98
  20. umap/locale/nl/LC_MESSAGES/django.mo +0 -0
  21. umap/locale/nl/LC_MESSAGES/django.po +196 -151
  22. umap/locale/pt/LC_MESSAGES/django.mo +0 -0
  23. umap/locale/pt/LC_MESSAGES/django.po +115 -71
  24. umap/locale/zh_TW/LC_MESSAGES/django.mo +0 -0
  25. umap/locale/zh_TW/LC_MESSAGES/django.po +109 -65
  26. umap/management/commands/empty_trash.py +12 -1
  27. umap/migrations/0026_datalayer_modified_at_datalayer_share_status.py +26 -0
  28. umap/models.py +43 -13
  29. umap/settings/base.py +5 -2
  30. umap/static/umap/base.css +5 -2
  31. umap/static/umap/content.css +2 -22
  32. umap/static/umap/css/bar.css +39 -10
  33. umap/static/umap/css/contextmenu.css +14 -2
  34. umap/static/umap/css/form.css +33 -39
  35. umap/static/umap/css/icon.css +47 -5
  36. umap/static/umap/css/panel.css +20 -2
  37. umap/static/umap/css/popup.css +0 -1
  38. umap/static/umap/css/tooltip.css +33 -31
  39. umap/static/umap/img/16-white.svg +5 -3
  40. umap/static/umap/img/16.svg +1 -1
  41. umap/static/umap/img/24-white.svg +17 -16
  42. umap/static/umap/img/24.svg +29 -18
  43. umap/static/umap/img/providers/bitbucket.png +0 -0
  44. umap/static/umap/img/providers/github.png +0 -0
  45. umap/static/umap/img/providers/keycloak.png +0 -0
  46. umap/static/umap/img/providers/openstreetmap-oauth2.png +0 -0
  47. umap/static/umap/img/providers/twitter-oauth2.png +0 -0
  48. umap/static/umap/img/source/16-white.svg +6 -4
  49. umap/static/umap/img/source/16.svg +1 -1
  50. umap/static/umap/img/source/24-white.svg +20 -18
  51. umap/static/umap/img/source/24.svg +30 -19
  52. umap/static/umap/js/components/alerts/alert.js +4 -1
  53. umap/static/umap/js/modules/browser.js +8 -8
  54. umap/static/umap/js/modules/caption.js +30 -7
  55. umap/static/umap/js/modules/data/features.js +101 -56
  56. umap/static/umap/js/modules/data/layer.js +108 -83
  57. umap/static/umap/js/modules/form/builder.js +242 -0
  58. umap/static/umap/js/modules/form/fields.js +1346 -0
  59. umap/static/umap/js/modules/formatter.js +9 -8
  60. umap/static/umap/js/modules/help.js +20 -24
  61. umap/static/umap/js/modules/importer.js +6 -3
  62. umap/static/umap/js/modules/permissions.js +11 -6
  63. umap/static/umap/js/modules/rendering/icon.js +5 -1
  64. umap/static/umap/js/modules/rendering/layers/classified.js +12 -8
  65. umap/static/umap/js/modules/rendering/layers/cluster.js +11 -1
  66. umap/static/umap/js/modules/rendering/map.js +1 -23
  67. umap/static/umap/js/modules/rendering/ui.js +20 -38
  68. umap/static/umap/js/modules/rules.js +3 -2
  69. umap/static/umap/js/modules/saving.js +5 -0
  70. umap/static/umap/js/modules/schema.js +8 -6
  71. umap/static/umap/js/modules/share.js +3 -3
  72. umap/static/umap/js/modules/sync/engine.js +56 -26
  73. umap/static/umap/js/modules/sync/updaters.js +15 -6
  74. umap/static/umap/js/modules/sync/websocket.js +50 -37
  75. umap/static/umap/js/modules/tableeditor.js +3 -2
  76. umap/static/umap/js/modules/ui/bar.js +101 -9
  77. umap/static/umap/js/modules/ui/base.js +7 -24
  78. umap/static/umap/js/modules/ui/contextmenu.js +9 -2
  79. umap/static/umap/js/modules/ui/panel.js +5 -1
  80. umap/static/umap/js/modules/ui/tooltip.js +19 -11
  81. umap/static/umap/js/modules/umap.js +121 -68
  82. umap/static/umap/js/modules/utils.js +196 -12
  83. umap/static/umap/js/umap.controls.js +11 -353
  84. umap/static/umap/locale/am_ET.js +17 -5
  85. umap/static/umap/locale/am_ET.json +17 -5
  86. umap/static/umap/locale/ar.js +17 -5
  87. umap/static/umap/locale/ar.json +17 -5
  88. umap/static/umap/locale/ast.js +17 -5
  89. umap/static/umap/locale/ast.json +17 -5
  90. umap/static/umap/locale/bg.js +17 -5
  91. umap/static/umap/locale/bg.json +17 -5
  92. umap/static/umap/locale/br.js +33 -20
  93. umap/static/umap/locale/br.json +33 -20
  94. umap/static/umap/locale/ca.js +17 -5
  95. umap/static/umap/locale/ca.json +17 -5
  96. umap/static/umap/locale/cs_CZ.js +15 -5
  97. umap/static/umap/locale/cs_CZ.json +15 -5
  98. umap/static/umap/locale/da.js +17 -5
  99. umap/static/umap/locale/da.json +17 -5
  100. umap/static/umap/locale/de.js +17 -5
  101. umap/static/umap/locale/de.json +17 -5
  102. umap/static/umap/locale/el.js +63 -51
  103. umap/static/umap/locale/el.json +63 -51
  104. umap/static/umap/locale/en.js +15 -5
  105. umap/static/umap/locale/en.json +15 -5
  106. umap/static/umap/locale/en_US.json +17 -5
  107. umap/static/umap/locale/es.js +25 -13
  108. umap/static/umap/locale/es.json +25 -13
  109. umap/static/umap/locale/et.js +17 -5
  110. umap/static/umap/locale/et.json +17 -5
  111. umap/static/umap/locale/eu.js +17 -5
  112. umap/static/umap/locale/eu.json +17 -5
  113. umap/static/umap/locale/fa_IR.js +17 -5
  114. umap/static/umap/locale/fa_IR.json +17 -5
  115. umap/static/umap/locale/fi.js +17 -5
  116. umap/static/umap/locale/fi.json +17 -5
  117. umap/static/umap/locale/fr.js +16 -6
  118. umap/static/umap/locale/fr.json +16 -6
  119. umap/static/umap/locale/gl.js +357 -345
  120. umap/static/umap/locale/gl.json +357 -345
  121. umap/static/umap/locale/he.js +17 -5
  122. umap/static/umap/locale/he.json +17 -5
  123. umap/static/umap/locale/hr.js +17 -5
  124. umap/static/umap/locale/hr.json +17 -5
  125. umap/static/umap/locale/hu.js +14 -5
  126. umap/static/umap/locale/hu.json +14 -5
  127. umap/static/umap/locale/id.js +17 -5
  128. umap/static/umap/locale/id.json +17 -5
  129. umap/static/umap/locale/is.js +17 -5
  130. umap/static/umap/locale/is.json +17 -5
  131. umap/static/umap/locale/it.js +125 -113
  132. umap/static/umap/locale/it.json +125 -113
  133. umap/static/umap/locale/ja.js +17 -5
  134. umap/static/umap/locale/ja.json +17 -5
  135. umap/static/umap/locale/ko.js +17 -5
  136. umap/static/umap/locale/ko.json +17 -5
  137. umap/static/umap/locale/lt.js +17 -5
  138. umap/static/umap/locale/lt.json +17 -5
  139. umap/static/umap/locale/ms.js +17 -5
  140. umap/static/umap/locale/ms.json +17 -5
  141. umap/static/umap/locale/nl.js +132 -119
  142. umap/static/umap/locale/nl.json +132 -119
  143. umap/static/umap/locale/no.js +17 -5
  144. umap/static/umap/locale/no.json +17 -5
  145. umap/static/umap/locale/pl.js +17 -5
  146. umap/static/umap/locale/pl.json +17 -5
  147. umap/static/umap/locale/pl_PL.json +17 -5
  148. umap/static/umap/locale/pt.js +38 -25
  149. umap/static/umap/locale/pt.json +38 -25
  150. umap/static/umap/locale/pt_BR.js +17 -5
  151. umap/static/umap/locale/pt_BR.json +17 -5
  152. umap/static/umap/locale/pt_PT.js +17 -5
  153. umap/static/umap/locale/pt_PT.json +17 -5
  154. umap/static/umap/locale/ro.js +17 -5
  155. umap/static/umap/locale/ro.json +17 -5
  156. umap/static/umap/locale/ru.js +17 -5
  157. umap/static/umap/locale/ru.json +17 -5
  158. umap/static/umap/locale/sk_SK.js +17 -5
  159. umap/static/umap/locale/sk_SK.json +17 -5
  160. umap/static/umap/locale/sl.js +17 -5
  161. umap/static/umap/locale/sl.json +17 -5
  162. umap/static/umap/locale/sr.js +17 -5
  163. umap/static/umap/locale/sr.json +17 -5
  164. umap/static/umap/locale/sv.js +17 -5
  165. umap/static/umap/locale/sv.json +17 -5
  166. umap/static/umap/locale/th_TH.js +17 -5
  167. umap/static/umap/locale/th_TH.json +17 -5
  168. umap/static/umap/locale/tr.js +17 -5
  169. umap/static/umap/locale/tr.json +17 -5
  170. umap/static/umap/locale/uk_UA.js +17 -5
  171. umap/static/umap/locale/uk_UA.json +17 -5
  172. umap/static/umap/locale/vi.js +17 -5
  173. umap/static/umap/locale/vi.json +17 -5
  174. umap/static/umap/locale/vi_VN.json +17 -5
  175. umap/static/umap/locale/zh.js +17 -5
  176. umap/static/umap/locale/zh.json +17 -5
  177. umap/static/umap/locale/zh_CN.json +17 -5
  178. umap/static/umap/locale/zh_TW.Big5.json +17 -5
  179. umap/static/umap/locale/zh_TW.js +15 -5
  180. umap/static/umap/locale/zh_TW.json +15 -5
  181. umap/static/umap/map.css +29 -76
  182. umap/static/umap/nav.css +6 -3
  183. umap/static/umap/unittests/utils.js +14 -0
  184. umap/static/umap/vars.css +3 -0
  185. umap/static/umap/vendors/dompurify/purify.es.js +138 -354
  186. umap/static/umap/vendors/dompurify/purify.es.mjs.map +1 -1
  187. umap/static/umap/vendors/editable/Leaflet.Editable.js +1 -0
  188. umap/sync/__init__.py +0 -0
  189. umap/sync/app.py +187 -0
  190. umap/sync/payloads.py +56 -0
  191. umap/templates/auth/user_detail.html +4 -0
  192. umap/templates/auth/user_form.html +9 -6
  193. umap/templates/auth/user_stars.html +4 -0
  194. umap/templates/base.html +1 -1
  195. umap/templates/registration/login.html +2 -5
  196. umap/templates/umap/about.html +5 -0
  197. umap/templates/umap/about_summary.html +2 -2
  198. umap/templates/umap/components/provider.html +8 -0
  199. umap/templates/umap/content_footer.html +1 -1
  200. umap/templates/umap/css.html +0 -2
  201. umap/templates/umap/js.html +0 -4
  202. umap/templates/umap/map_detail.html +1 -1
  203. umap/templates/umap/password_change.html +4 -0
  204. umap/templates/umap/password_change_done.html +4 -0
  205. umap/templates/umap/search.html +4 -0
  206. umap/templates/umap/search_bar.html +1 -0
  207. umap/templates/umap/team_confirm_delete.html +4 -0
  208. umap/templates/umap/team_detail.html +4 -0
  209. umap/templates/umap/team_form.html +4 -0
  210. umap/templates/umap/user_dashboard.html +1 -1
  211. umap/templates/umap/user_teams.html +4 -0
  212. umap/tests/base.py +3 -1
  213. umap/tests/integration/conftest.py +16 -23
  214. umap/tests/integration/test_anonymous_owned_map.py +2 -2
  215. umap/tests/integration/test_basics.py +4 -7
  216. umap/tests/integration/test_caption.py +1 -0
  217. umap/tests/integration/test_categorized_layer.py +4 -8
  218. umap/tests/integration/test_choropleth.py +1 -1
  219. umap/tests/integration/test_conditional_rules.py +3 -3
  220. umap/tests/integration/test_draw_polygon.py +14 -22
  221. umap/tests/integration/test_draw_polyline.py +6 -14
  222. umap/tests/integration/test_edit_datalayer.py +11 -11
  223. umap/tests/integration/test_edit_map.py +30 -4
  224. umap/tests/integration/test_edit_marker.py +5 -5
  225. umap/tests/integration/test_edit_polygon.py +6 -6
  226. umap/tests/integration/test_features_id_generation.py +2 -6
  227. umap/tests/integration/test_import.py +115 -29
  228. umap/tests/integration/test_optimistic_merge.py +1 -0
  229. umap/tests/integration/test_owned_map.py +1 -1
  230. umap/tests/integration/test_picto.py +8 -8
  231. umap/tests/integration/test_save.py +3 -2
  232. umap/tests/integration/test_star.py +13 -9
  233. umap/tests/integration/test_tableeditor.py +8 -7
  234. umap/tests/integration/test_view_marker.py +10 -0
  235. umap/tests/integration/test_websocket_sync.py +239 -64
  236. umap/tests/settings.py +2 -0
  237. umap/tests/test_datalayer.py +2 -3
  238. umap/tests/test_datalayer_views.py +20 -1
  239. umap/tests/test_empty_trash.py +10 -3
  240. umap/tests/test_map_views.py +11 -0
  241. umap/utils.py +27 -11
  242. umap/views.py +37 -6
  243. {umap_project-2.8.2.dist-info → umap_project-2.9.0.dist-info}/METADATA +22 -22
  244. {umap_project-2.8.2.dist-info → umap_project-2.9.0.dist-info}/RECORD +247 -248
  245. {umap_project-2.8.2.dist-info → umap_project-2.9.0.dist-info}/WHEEL +1 -1
  246. umap/management/commands/run_websocket_server.py +0 -23
  247. umap/settings/local_s3.py +0 -45
  248. umap/static/umap/bitbucket.png +0 -0
  249. umap/static/umap/github.png +0 -0
  250. umap/static/umap/js/umap.forms.js +0 -1242
  251. umap/static/umap/keycloak.png +0 -0
  252. umap/static/umap/openstreetmap.png +0 -0
  253. umap/static/umap/twitter.png +0 -0
  254. umap/static/umap/vendors/formbuilder/Leaflet.FormBuilder.js +0 -468
  255. umap/static/umap/vendors/toolbar/leaflet.toolbar.css +0 -1
  256. umap/static/umap/vendors/toolbar/leaflet.toolbar.js +0 -1
  257. umap/tests/test_websocket_server.py +0 -22
  258. umap/websocket_server.py +0 -202
  259. {umap_project-2.8.2.dist-info → umap_project-2.9.0.dist-info}/entry_points.txt +0 -0
  260. {umap_project-2.8.2.dist-info → umap_project-2.9.0.dist-info}/licenses/LICENSE +0 -0
umap/websocket_server.py DELETED
@@ -1,202 +0,0 @@
1
- #!/usr/bin/env python
2
-
3
- import asyncio
4
- import logging
5
- import uuid
6
- from collections import defaultdict
7
- from typing import Literal, Optional, Union
8
-
9
- import websockets
10
- from django.conf import settings
11
- from django.core.signing import TimestampSigner
12
- from pydantic import BaseModel, Field, RootModel, ValidationError
13
- from websockets import WebSocketClientProtocol
14
- from websockets.server import serve
15
-
16
-
17
- class Connections:
18
- def __init__(self) -> None:
19
- self._connections: set[WebSocketClientProtocol] = set()
20
- self._ids: dict[WebSocketClientProtocol, str] = dict()
21
-
22
- def join(self, websocket: WebSocketClientProtocol) -> str:
23
- self._connections.add(websocket)
24
- _id = str(uuid.uuid4())
25
- self._ids[websocket] = _id
26
- return _id
27
-
28
- def leave(self, websocket: WebSocketClientProtocol) -> None:
29
- self._connections.remove(websocket)
30
- del self._ids[websocket]
31
-
32
- def get(self, id) -> WebSocketClientProtocol:
33
- # use an iterator to stop iterating as soon as we found
34
- return next(k for k, v in self._ids.items() if v == id)
35
-
36
- def get_id(self, websocket: WebSocketClientProtocol):
37
- return self._ids[websocket]
38
-
39
- def get_other_peers(
40
- self, websocket: WebSocketClientProtocol
41
- ) -> set[WebSocketClientProtocol]:
42
- return self._connections - {websocket}
43
-
44
- def get_all_peers(self) -> set[WebSocketClientProtocol]:
45
- return self._connections
46
-
47
-
48
- # Contains the list of websocket connections handled by this process.
49
- # It's a mapping of map_id to a set of the active websocket connections
50
- CONNECTIONS: defaultdict[int, Connections] = defaultdict(Connections)
51
-
52
-
53
- class JoinRequest(BaseModel):
54
- kind: Literal["JoinRequest"] = "JoinRequest"
55
- token: str
56
-
57
-
58
- class OperationMessage(BaseModel):
59
- """Message sent from one peer to all the others"""
60
-
61
- kind: Literal["OperationMessage"] = "OperationMessage"
62
- verb: Literal["upsert", "update", "delete"]
63
- subject: Literal["map", "datalayer", "feature"]
64
- metadata: Optional[dict] = None
65
- key: Optional[str] = None
66
-
67
-
68
- class PeerMessage(BaseModel):
69
- """Message sent from a specific peer to another one"""
70
-
71
- kind: Literal["PeerMessage"] = "PeerMessage"
72
- sender: str
73
- recipient: str
74
- # The message can be whatever the peers want. It's not checked by the server.
75
- message: dict
76
-
77
-
78
- class ServerRequest(BaseModel):
79
- """A request towards the server"""
80
-
81
- kind: Literal["Server"] = "Server"
82
- action: Literal["list-peers"]
83
-
84
-
85
- class Request(RootModel):
86
- """Any message coming from the websocket should be one of these, and will be rejected otherwise."""
87
-
88
- root: Union[ServerRequest, PeerMessage, OperationMessage] = Field(
89
- discriminator="kind"
90
- )
91
-
92
-
93
- class JoinResponse(BaseModel):
94
- """Server response containing the list of peers"""
95
-
96
- kind: Literal["JoinResponse"] = "JoinResponse"
97
- peers: list
98
- uuid: str
99
-
100
-
101
- class ListPeersResponse(BaseModel):
102
- kind: Literal["ListPeersResponse"] = "ListPeersResponse"
103
- peers: list
104
-
105
-
106
- async def join_and_listen(
107
- map_id: int, permissions: list, user: str | int, websocket: WebSocketClientProtocol
108
- ):
109
- """Join a "room" with other connected peers, and wait for messages."""
110
- logging.debug(f"{user} joined room #{map_id}")
111
- connections: Connections = CONNECTIONS[map_id]
112
- _id: str = connections.join(websocket)
113
-
114
- # Assign an ID to the joining peer and return it the list of connected peers.
115
- peers: list[WebSocketClientProtocol] = [
116
- connections.get_id(p) for p in connections.get_all_peers()
117
- ]
118
- response = JoinResponse(uuid=_id, peers=peers)
119
- await websocket.send(response.model_dump_json())
120
-
121
- # Notify all other peers of the new list of connected peers.
122
- message = ListPeersResponse(peers=peers)
123
- websockets.broadcast(
124
- connections.get_other_peers(websocket), message.model_dump_json()
125
- )
126
-
127
- try:
128
- async for raw_message in websocket:
129
- if raw_message == "ping":
130
- await websocket.send("pong")
131
- continue
132
-
133
- # recompute the peers list at the time of message-sending.
134
- # as doing so beforehand would miss new connections
135
- other_peers = connections.get_other_peers(websocket)
136
- try:
137
- incoming = Request.model_validate_json(raw_message)
138
- except ValidationError as e:
139
- error = f"An error occurred when receiving the following message: {raw_message!r}"
140
- logging.error(error, e)
141
- else:
142
- match incoming.root:
143
- # Broadcast all operation messages to connected peers
144
- case OperationMessage():
145
- websockets.broadcast(other_peers, raw_message)
146
-
147
- # Send peer messages to the proper peer
148
- case PeerMessage(recipient=_id):
149
- peer = connections.get(_id)
150
- if peer:
151
- await peer.send(raw_message)
152
-
153
- finally:
154
- # On disconnect, remove the connection from the pool
155
- connections.leave(websocket)
156
-
157
- # TODO: refactor this in a separate method.
158
- # Notify all other peers of the new list of connected peers.
159
- peers = [connections.get_id(p) for p in connections.get_all_peers()]
160
- message = ListPeersResponse(peers=peers)
161
- websockets.broadcast(
162
- connections.get_other_peers(websocket), message.model_dump_json()
163
- )
164
-
165
-
166
- async def handler(websocket: WebSocketClientProtocol):
167
- """Main WebSocket handler.
168
-
169
- Check if the permission is granted and let the peer enter a room.
170
- """
171
- raw_message = await websocket.recv()
172
-
173
- # The first event should always be 'join'
174
- message: JoinRequest = JoinRequest.model_validate_json(raw_message)
175
- signed = TimestampSigner().unsign_object(message.token, max_age=30)
176
- user, map_id, permissions = signed.values()
177
-
178
- # Check if permissions for this map have been granted by the server
179
- if "edit" in signed["permissions"]:
180
- await join_and_listen(map_id, permissions, user, websocket)
181
-
182
-
183
- def run(host: str, port: int):
184
- if not settings.WEBSOCKET_ENABLED:
185
- msg = (
186
- "WEBSOCKET_ENABLED should be set to True to run the WebSocket Server. "
187
- "See the documentation at "
188
- "https://docs.umap-project.org/en/stable/config/settings/#websocket_enabled "
189
- "for more information."
190
- )
191
- print(msg)
192
- exit(1)
193
-
194
- async def _serve():
195
- async with serve(handler, host, port):
196
- logging.debug(f"Waiting for connections on {host}:{port}")
197
- await asyncio.Future() # run forever
198
-
199
- try:
200
- asyncio.run(_serve())
201
- except KeyboardInterrupt:
202
- print("Closing WebSocket server")